This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push: new 977ecae PHOENIX-6636 Replace bundled log4j libraries with reload4j 977ecae is described below commit 977ecae4851f2bee71b04a5aae94b9f173f20e35 Author: Istvan Toth <st...@apache.org> AuthorDate: Mon Jan 31 12:48:12 2022 +0100 PHOENIX-6636 Replace bundled log4j libraries with reload4j --- phoenix-assembly/src/build/package-to-tar-all.xml | 3 +- .../phoenix-client-embedded/pom.xml | 13 +++++++ phoenix-client-parent/phoenix-client/pom.xml | 14 +++++-- phoenix-core/pom.xml | 10 ++--- phoenix-tracing-webapp/pom.xml | 4 +- pom.xml | 45 ++++++++++++++++++---- 6 files changed, 69 insertions(+), 20 deletions(-) diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml b/phoenix-assembly/src/build/package-to-tar-all.xml index f64ace9..e03d4e8 100644 --- a/phoenix-assembly/src/build/package-to-tar-all.xml +++ b/phoenix-assembly/src/build/package-to-tar-all.xml @@ -36,7 +36,8 @@ <unpack>false</unpack> <outputDirectory>/lib</outputDirectory> <includes> - <include>org.slf4j:slf4j-log4j12</include> + <include>org.slf4j:slf4j-reload4j</include> + <include>ch.qos.reload4j:reload4j</include> </includes> </dependencySet> </dependencySets> diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml index 815f0ce..f757e65 100644 --- a/phoenix-client-parent/phoenix-client-embedded/pom.xml +++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml @@ -73,8 +73,21 @@ <exclusions> <exclusion> <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <!-- These are coming from transitive dependencies --> + <exclusion> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/phoenix-client-parent/phoenix-client/pom.xml b/phoenix-client-parent/phoenix-client/pom.xml index e2eb54f..9af876e 100644 --- a/phoenix-client-parent/phoenix-client/pom.xml +++ b/phoenix-client-parent/phoenix-client/pom.xml @@ -77,12 +77,18 @@ <optional>false</optional> </dependency> <dependency> - <groupId>sqlline</groupId> - <artifactId>sqlline</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>sqlline</groupId> + <artifactId>sqlline</artifactId> </dependency> </dependencies> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 2208e12..ebaf43f 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -178,8 +178,12 @@ <configuration> <artifactItems> <artifactItem> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </artifactItem> + <artifactItem> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> </artifactItem> <artifactItem> <groupId>sqlline</groupId> @@ -347,10 +351,6 @@ <artifactId>protobuf-java</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 62675ca..9963c21 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -61,8 +61,8 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index fa66753..8d67042 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,9 @@ <hadoop.version>2.7.1</hadoop.version> <jackson.version>2.12.4</jackson.version> <antlr.version>3.5.2</antlr.version> - <log4j.version>1.2.17</log4j.version> + <reload4j.version>1.2.19</reload4j.version> <disruptor.version>3.3.6</disruptor.version> - <slf4j.version>1.6.4</slf4j.version> + <slf4j.version>1.7.36</slf4j.version> <commons-io.version>2.6</commons-io.version> <commons-lang.version>2.5</commons-lang.version> <!-- com.google repo will be used except on Aarch64 platform. --> @@ -1090,18 +1090,13 @@ <version>${protobuf-java.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> @@ -1175,6 +1170,40 @@ </exclusion> </exclusions> </dependency> + + <!-- Other test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + + <!-- Runtime dependencies --> + <dependency> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + <version>${reload4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + <version>${slf4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>sqlline</groupId> + <artifactId>sqlline</artifactId> + <version>${sqlline.version}</version> + <scope>runtime</scope> + </dependency> </dependencies> </dependencyManagement>