This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new 97c28919d3 PHOENIX-7195 Exclude reload4j dependencies from Hadoop and add explicit log4j2 test dependencies 97c28919d3 is described below commit 97c28919d361290631d00f0e3ed81562b784eb58 Author: Istvan Toth <st...@apache.org> AuthorDate: Mon Feb 5 10:59:13 2024 +0100 PHOENIX-7195 Exclude reload4j dependencies from Hadoop and add explicit log4j2 test dependencies --- phoenix-core/pom.xml | 35 ++++++++++++++++ pom.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 141 insertions(+), 6 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 704bb5d55e..9a78ada110 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -93,6 +93,18 @@ <ignoredUnusedDeclaredDependency> org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version} </ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency> + org.apache.logging.log4j:log4j-api + </ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency> + org.apache.logging.log4j:log4j-core + </ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency> + org.apache.logging.log4j:log4j-slf4j-impl + </ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency> + org.apache.logging.log4j:log4j-1.2-api + </ignoredUnusedDeclaredDependency> </ignoredUnusedDeclaredDependencies> <ignoredUsedUndeclaredDependencies> </ignoredUsedUndeclaredDependencies> @@ -444,5 +456,28 @@ <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> + + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> + </dependency> + <!-- logging end --> </dependencies> </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1be954d154..10e2bba01d 100644 --- a/pom.xml +++ b/pom.xml @@ -432,12 +432,6 @@ <ignoredUnusedDeclaredDependency> org.apache.logging.log4j:log4j-1.2-api </ignoredUnusedDeclaredDependency> - <ignoredUnusedDeclaredDependency> - org.apache.logging.log4j:log4j-api - </ignoredUnusedDeclaredDependency> - <ignoredUnusedDeclaredDependency> - org.apache.logging.log4j:log4j-core - </ignoredUnusedDeclaredDependency> </ignoredUnusedDeclaredDependencies> <ignoredUsedUndeclaredDependencies> <ignoredUsedUndeclaredDependency> @@ -852,6 +846,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> <exclusion> <!-- See HADOOP-18991 --> <groupId>commons-beanutils</groupId> @@ -877,6 +879,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> <exclusion> <!-- See HADOOP-18991 --> <groupId>commons-beanutils</groupId> @@ -897,6 +907,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -912,6 +930,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -949,6 +975,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -975,6 +1009,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> <version>${hadoop.version}</version> </dependency> @@ -1003,6 +1045,24 @@ <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> @@ -1019,6 +1079,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1041,6 +1109,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> @@ -1087,6 +1163,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1126,6 +1210,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1141,6 +1233,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency>