Skip to content

Commit 7d5b2a4

Browse files
meszinorbimeszinorbi
committed
PHOENIX-7622 Removed slf4j-reload4j, slf4j-log4j12, logback-classic
1 parent 61a8c3d commit 7d5b2a4

File tree

5 files changed

+54
-17
lines changed

5 files changed

+54
-17
lines changed

‎phoenix5-hive/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@
254254
<dependency>
255255
<groupId>org.apache.zookeeper</groupId>
256256
<artifactId>zookeeper</artifactId>
257-
<version>${zookeeper.version}</version>
258257
<scope>test</scope>
259258
</dependency>
260259

‎phoenix5-hive4/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,14 +288,7 @@
288288
<dependency>
289289
<groupId>org.apache.zookeeper</groupId>
290290
<artifactId>zookeeper</artifactId>
291-
<version>${zookeeper.version}</version>
292291
<scope>test</scope>
293-
<exclusions>
294-
<exclusion>
295-
<groupId>ch.qos.logback</groupId>
296-
<artifactId>*</artifactId>
297-
</exclusion>
298-
</exclusions>
299292
</dependency>
300293
<!-- Used by the copied Hive Testing Code -->
301294
<dependency>

‎phoenix5-spark/pom.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
<version>${spark.version}</version>
6262
<scope>provided</scope>
6363
<exclusions>
64+
<exclusion>
65+
<groupId>org.slf4j</groupId>
66+
<artifactId>slf4j-reload4j</artifactId>
67+
</exclusion>
6468
<!-- The shaded hadoop-client libraries conflict with hbase-shaded-mapreduce -->
6569
<exclusion>
6670
<groupId>org.apache.hadoop</groupId>
@@ -427,7 +431,6 @@
427431
<dependency>
428432
<groupId>org.apache.zookeeper</groupId>
429433
<artifactId>zookeeper</artifactId>
430-
<version>${zookeeper.version}</version>
431434
<scope>test</scope>
432435
</dependency>
433436

@@ -437,13 +440,6 @@
437440
<artifactId>mockito-core</artifactId>
438441
<scope>test</scope>
439442
</dependency>
440-
441-
<!-- We want to take the implementation from Spark -->
442-
<dependency>
443-
<groupId>org.slf4j</groupId>
444-
<artifactId>slf4j-log4j12</artifactId>
445-
<scope>test</scope>
446-
</dependency>
447443
</dependencies>
448444

449445
<build>

‎phoenix5-spark3/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@
184184
<!-- Why is this not provided transitively via Phoenix ? -->
185185
<groupId>org.apache.zookeeper</groupId>
186186
<artifactId>zookeeper</artifactId>
187-
<version>${zookeeper.version}</version>
188187
<scope>test</scope>
189188
</dependency>
190189
<dependency>

‎pom.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,16 @@
574574
<groupId>org.apache.phoenix</groupId>
575575
<artifactId>phoenix5-spark</artifactId>
576576
<version>${project.version}</version>
577+
<exclusions>
578+
<exclusion>
579+
<groupId>org.slf4j</groupId>
580+
<artifactId>slf4j-reload4j</artifactId>
581+
</exclusion>
582+
<exclusion>
583+
<groupId>org.slf4j</groupId>
584+
<artifactId>slf4j-log4j12</artifactId>
585+
</exclusion>
586+
</exclusions>
577587
</dependency>
578588
<dependency>
579589
<groupId>org.apache.phoenix</groupId>
@@ -671,6 +681,7 @@
671681
</dependency>
672682
<!-- End of exclusion-only dependencies -->
673683

684+
674685
<dependency>
675686
<groupId>org.apache.hbase</groupId>
676687
<artifactId>hbase-annotations</artifactId>
@@ -691,6 +702,10 @@
691702
<groupId>org.apache.hadoop</groupId>
692703
<artifactId>hadoop-hdfs</artifactId>
693704
</exclusion>
705+
<exclusion>
706+
<groupId>org.slf4j</groupId>
707+
<artifactId>slf4j-reload4j</artifactId>
708+
</exclusion>
694709
</exclusions>
695710
</dependency>
696711
<dependency>
@@ -807,6 +822,10 @@
807822
<groupId>org.xerial.snappy</groupId>
808823
<artifactId>snappy-java</artifactId>
809824
</exclusion>
825+
<exclusion>
826+
<groupId>org.slf4j</groupId>
827+
<artifactId>slf4j-reload4j</artifactId>
828+
</exclusion>
810829
</exclusions>
811830
</dependency>
812831
<dependency>
@@ -818,11 +837,23 @@
818837
<groupId>org.apache.hadoop</groupId>
819838
<artifactId>hadoop-mapreduce-client-core</artifactId>
820839
<version>${hadoop.version}</version>
840+
<exclusions>
841+
<exclusion>
842+
<groupId>org.slf4j</groupId>
843+
<artifactId>slf4j-reload4j</artifactId>
844+
</exclusion>
845+
</exclusions>
821846
</dependency>
822847
<dependency>
823848
<groupId>org.apache.hadoop</groupId>
824849
<artifactId>hadoop-minicluster</artifactId>
825850
<version>${hadoop.version}</version>
851+
<exclusions>
852+
<exclusion>
853+
<groupId>org.slf4j</groupId>
854+
<artifactId>slf4j-reload4j</artifactId>
855+
</exclusion>
856+
</exclusions>
826857
</dependency>
827858
<dependency>
828859
<groupId>org.apache.hadoop</groupId>
@@ -909,9 +940,28 @@
909940
<groupId>org.apache.hadoop</groupId>
910941
<artifactId>hadoop-minikdc</artifactId>
911942
<version>${hadoop.version}</version>
943+
<exclusions>
944+
<exclusion>
945+
<groupId>org.slf4j</groupId>
946+
<artifactId>slf4j-reload4j</artifactId>
947+
</exclusion>
948+
</exclusions>
912949
</dependency>
913950

914951
<!-- General Dependencies -->
952+
<dependency>
953+
<groupId>org.apache.zookeeper</groupId>
954+
<artifactId>zookeeper</artifactId>
955+
<version>${zookeeper.version}</version>
956+
<scope>test</scope>
957+
<exclusions>
958+
<exclusion>
959+
<groupId>ch.qos.logback</groupId>
960+
<artifactId>*</artifactId>
961+
</exclusion>
962+
</exclusions>
963+
</dependency>
964+
915965
<dependency>
916966
<groupId>com.google.protobuf</groupId>
917967
<artifactId>protobuf-java</artifactId>

0 commit comments

Comments
 (0)