This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push: new af048d96b0 Update log4j and remove log4j-core dependency (#3215) af048d96b0 is described below commit af048d96b09318205eea2f429b4f8cf74d663c6b Author: Dom G <domgargu...@apache.org> AuthorDate: Fri Mar 3 10:01:06 2023 -0500 Update log4j and remove log4j-core dependency (#3215) * Update log4j and remove log4j-core dependency * Remove outdated comments and unused dependency rule --------- Co-authored-by: Christopher Tubbs <ctubb...@apache.org> --- core/pom.xml | 6 ------ hadoop-mapreduce/pom.xml | 6 ------ iterator-test-harness/pom.xml | 6 ------ minicluster/pom.xml | 4 ---- pom.xml | 4 +--- server/base/pom.xml | 6 ------ server/compaction-coordinator/pom.xml | 6 ------ server/compactor/pom.xml | 6 ------ server/gc/pom.xml | 6 ------ server/manager/pom.xml | 6 ------ server/native/pom.xml | 6 ------ server/tserver/pom.xml | 6 ------ shell/pom.xml | 6 ------ start/pom.xml | 6 ------ test/pom.xml | 4 ---- 15 files changed, 1 insertion(+), 83 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 7a1b07b1ce..ee75be936c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -159,12 +159,6 @@ <artifactId>hadoop-client-minicluster</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index 0b4f250d6f..b03389b11f 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -71,12 +71,6 @@ <artifactId>accumulo-test</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index dbe90595e0..be14bd5a4e 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -59,12 +59,6 @@ <artifactId>hadoop-client-runtime</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/minicluster/pom.xml b/minicluster/pom.xml index f6d0dc5ebd..2bf23ab003 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -129,10 +129,6 @@ <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> - <!-- Even with the bug from https://issues.apache.org/jira/browse/LOG4J2-3601 - log4j2-core is not needed to be listed because accumulo-monitor has a - transitive dependency already. - --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/pom.xml b/pom.xml index a430d2a15c..a68b9ff4c3 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-bom</artifactId> - <version>2.19.0</version> + <version>2.20.0</version> <type>pom</type> <scope>import</scope> </dependency> @@ -1014,8 +1014,6 @@ <unused>org.apache.logging.log4j:log4j-1.2-api:jar:*</unused> <unused>org.apache.logging.log4j:log4j-slf4j2-impl:jar:*</unused> <unused>org.apache.logging.log4j:log4j-web:jar:*</unused> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <unused>org.apache.logging.log4j:log4j-core:jar:*</unused> <!-- This should be removed upon completion of migrating junit 4 to 5 --> <unused>org.junit.vintage:junit-vintage-engine:jar:*</unused> <unused>org.junit.jupiter:junit-jupiter-engine:jar:*</unused> diff --git a/server/base/pom.xml b/server/base/pom.xml index a984be09f3..c15fbcacee 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -117,12 +117,6 @@ <artifactId>hadoop-client-runtime</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index aa8d51ebfd..c37d6eda77 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -76,12 +76,6 @@ <artifactId>hadoop-client-runtime</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index d818d6c26b..c722d679f2 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -79,12 +79,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 48d47b537f..6a3e317b90 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -89,12 +89,6 @@ <artifactId>hadoop-client-runtime</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/server/manager/pom.xml b/server/manager/pom.xml index 21403a4c0a..b98fa8618f 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -109,12 +109,6 @@ <artifactId>hadoop-client-runtime</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/server/native/pom.xml b/server/native/pom.xml index 1f01c021c6..c7cfb750e6 100644 --- a/server/native/pom.xml +++ b/server/native/pom.xml @@ -40,12 +40,6 @@ <artifactId>accumulo-tserver</artifactId> <optional>true</optional> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index a661df1373..d6aa6e0a54 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -118,12 +118,6 @@ <artifactId>commons-io</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/shell/pom.xml b/shell/pom.xml index 4a3b90aecd..f35c79091f 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -105,12 +105,6 @@ <artifactId>commons-io</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/start/pom.xml b/start/pom.xml index 780e579115..45db3813eb 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -69,12 +69,6 @@ <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- needed because https://issues.apache.org/jira/browse/LOG4J2-3601 --> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 58f31b9e12..7ac04c6b7e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -220,10 +220,6 @@ <artifactId>accumulo-iterator-test-harness</artifactId> <scope>test</scope> </dependency> - <!-- Even with the bug from https://issues.apache.org/jira/browse/LOG4J2-3601 - log4j2-core is not needed to be listed because accumulo-monitor has a - transitive dependency already. - --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId>