Skip to content

Commit 18321ed

Browse files
meszinorbimeszinorbi
committed
PHOENIX-7600 Replace commons-logging with slf4j
1 parent 13ea865 commit 18321ed

File tree

5 files changed

+97
-0
lines changed

5 files changed

+97
-0
lines changed

‎phoenix5-hive-shaded/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<groupId>commons-beanutils</groupId>
126126
<artifactId>commons-beanutils</artifactId>
127127
<scope>compile</scope>
128+
<exclusions>
129+
<exclusion>
130+
<groupId>commons-logging</groupId>
131+
<artifactId>commons-logging</artifactId>
132+
</exclusion>
133+
</exclusions>
128134
</dependency>
129135

130136
<!-- Mark every Hadoop jar as provided -->

‎phoenix5-hive/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@
106106
<groupId>org.eclipse.jetty</groupId>
107107
<artifactId>*</artifactId>
108108
</exclusion>
109+
<exclusion>
110+
<groupId>commons-logging</groupId>
111+
<artifactId>commons-logging</artifactId>
112+
</exclusion>
109113
</exclusions>
110114
</dependency>
111115
<dependency>
@@ -146,6 +150,11 @@
146150
<artifactId>slf4j-api</artifactId>
147151
<scope>provided</scope>
148152
</dependency>
153+
<dependency>
154+
<groupId>org.slf4j</groupId>
155+
<artifactId>jcl-over-slf4j</artifactId>
156+
<scope>provided</scope>
157+
</dependency>
149158

150159
<!-- Phoenix Test dependencies -->
151160
<dependency>
@@ -193,6 +202,10 @@
193202
<groupId>io.netty</groupId>
194203
<artifactId>netty</artifactId>
195204
</exclusion>
205+
<exclusion>
206+
<groupId>commons-logging</groupId>
207+
<artifactId>commons-logging</artifactId>
208+
</exclusion>
196209
</exclusions>
197210
<type>test-jar</type>
198211
<scope>test</scope> <!-- ? -->

‎phoenix5-hive4/pom.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@
124124
<artifactId>hive-exec</artifactId>
125125
<version>${hive.version}</version>
126126
<scope>provided</scope>
127+
<exclusions>
128+
<exclusion>
129+
<groupId>commons-logging</groupId>
130+
<artifactId>commons-logging</artifactId>
131+
</exclusion>
132+
</exclusions>
127133
</dependency>
128134
<dependency>
129135
<groupId> org.apache.hive</groupId>
@@ -156,6 +162,11 @@
156162
<artifactId>slf4j-api</artifactId>
157163
<scope>provided</scope>
158164
</dependency>
165+
<dependency>
166+
<groupId>org.slf4j</groupId>
167+
<artifactId>jcl-over-slf4j</artifactId>
168+
<scope>provided</scope>
169+
</dependency>
159170

160171
<!-- Phoenix Test dependencies -->
161172
<dependency>
@@ -219,6 +230,10 @@
219230
<groupId>org.slf4j</groupId>
220231
<artifactId>slf4j-reload4j</artifactId>
221232
</exclusion>
233+
<exclusion>
234+
<groupId>commons-logging</groupId>
235+
<artifactId>commons-logging</artifactId>
236+
</exclusion>
222237
</exclusions>
223238
<type>test-jar</type>
224239
<scope>test</scope> <!-- ? -->
@@ -237,6 +252,12 @@
237252
<artifactId>hive-standalone-metastore-common</artifactId>
238253
<version>${hive.version}</version>
239254
<scope>test</scope>
255+
<exclusions>
256+
<exclusion>
257+
<groupId>commons-logging</groupId>
258+
<artifactId>commons-logging</artifactId>
259+
</exclusion>
260+
</exclusions>
240261
</dependency>
241262
<dependency>
242263
<groupId> org.apache.hive</groupId>
@@ -257,12 +278,24 @@
257278
<version>${hive.version}</version>
258279
<scope>test</scope>
259280
<type>test-jar</type>
281+
<exclusions>
282+
<exclusion>
283+
<groupId>commons-logging</groupId>
284+
<artifactId>commons-logging</artifactId>
285+
</exclusion>
286+
</exclusions>
260287
</dependency>
261288
<dependency>
262289
<groupId>org.apache.hive</groupId>
263290
<artifactId>hive-standalone-metastore-server</artifactId>
264291
<version>${hive.version}</version>
265292
<scope>test</scope>
293+
<exclusions>
294+
<exclusion>
295+
<groupId>commons-logging</groupId>
296+
<artifactId>commons-logging</artifactId>
297+
</exclusion>
298+
</exclusions>
266299
</dependency>
267300
<dependency>
268301
<groupId>org.apache.hive.hcatalog</groupId>
@@ -277,6 +310,7 @@
277310
<version>${hive.version}</version>
278311
<scope>test</scope>
279312
<type>test-jar</type>
313+
280314
</dependency>
281315
<dependency>
282316
<groupId> org.apache.hive</groupId>

‎phoenix5-spark/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,11 @@
332332
<artifactId>slf4j-api</artifactId>
333333
<scope>provided</scope>
334334
</dependency>
335+
<dependency>
336+
<groupId>org.slf4j</groupId>
337+
<artifactId>jcl-over-slf4j</artifactId>
338+
<scope>provided</scope>
339+
</dependency>
335340

336341
<!-- Test dependencies -->
337342
<dependency>

‎pom.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,10 @@
527527
<groupId>org.apache.hbase.thirdparty</groupId>
528528
<artifactId>hbase-shaded-jersey</artifactId>
529529
</exclusion>
530+
<exclusion>
531+
<groupId>commons-logging</groupId>
532+
<artifactId>commons-logging</artifactId>
533+
</exclusion>
530534
</exclusions>
531535
</dependency>
532536
<dependency>
@@ -691,6 +695,10 @@
691695
<groupId>org.apache.hadoop</groupId>
692696
<artifactId>hadoop-hdfs</artifactId>
693697
</exclusion>
698+
<exclusion>
699+
<groupId>commons-logging</groupId>
700+
<artifactId>commons-logging</artifactId>
701+
</exclusion>
694702
</exclusions>
695703
</dependency>
696704
<dependency>
@@ -715,6 +723,10 @@
715723
<groupId>org.jruby</groupId>
716724
<artifactId>jruby-complete</artifactId>
717725
</exclusion>
726+
<exclusion>
727+
<groupId>commons-logging</groupId>
728+
<artifactId>commons-logging</artifactId>
729+
</exclusion>
718730
</exclusions>
719731
</dependency>
720732
<dependency>
@@ -807,6 +819,10 @@
807819
<groupId>org.xerial.snappy</groupId>
808820
<artifactId>snappy-java</artifactId>
809821
</exclusion>
822+
<exclusion>
823+
<groupId>commons-logging</groupId>
824+
<artifactId>commons-logging</artifactId>
825+
</exclusion>
810826
</exclusions>
811827
</dependency>
812828
<dependency>
@@ -823,6 +839,12 @@
823839
<groupId>org.apache.hadoop</groupId>
824840
<artifactId>hadoop-minicluster</artifactId>
825841
<version>${hadoop.version}</version>
842+
<exclusions>
843+
<exclusion>
844+
<groupId>commons-logging</groupId>
845+
<artifactId>commons-logging</artifactId>
846+
</exclusion>
847+
</exclusions>
826848
</dependency>
827849
<dependency>
828850
<groupId>org.apache.hadoop</groupId>
@@ -897,13 +919,25 @@
897919
<groupId>org.apache.hadoop</groupId>
898920
<artifactId>hadoop-hdfs</artifactId>
899921
<version>${hadoop.version}</version>
922+
<exclusions>
923+
<exclusion>
924+
<groupId>commons-logging</groupId>
925+
<artifactId>commons-logging</artifactId>
926+
</exclusion>
927+
</exclusions>
900928
</dependency>
901929
<dependency>
902930
<groupId>org.apache.hadoop</groupId>
903931
<artifactId>hadoop-hdfs</artifactId>
904932
<version>${hadoop.version}</version>
905933
<type>test-jar</type> <!-- this does not work which is typical for maven. -->
906934
<scope>test</scope>
935+
<exclusions>
936+
<exclusion>
937+
<groupId>commons-logging</groupId>
938+
<artifactId>commons-logging</artifactId>
939+
</exclusion>
940+
</exclusions>
907941
</dependency>
908942
<dependency>
909943
<groupId>org.apache.hadoop</groupId>
@@ -923,6 +957,11 @@
923957
<artifactId>slf4j-api</artifactId>
924958
<version>${slf4j.version}</version>
925959
</dependency>
960+
<dependency>
961+
<groupId>org.slf4j</groupId>
962+
<artifactId>jcl-over-slf4j</artifactId>
963+
<version>${slf4j.version}</version>
964+
</dependency>
926965
<dependency>
927966
<!-- for exclusion -->
928967
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)