You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by cs...@apache.org on 2022/10/07 12:43:16 UTC
[accumulo] branch main updated: Add log4j-core as a test dependency where needed (#3000)
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new d2fd3d71d0 Add log4j-core as a test dependency where needed (#3000)
d2fd3d71d0 is described below
commit d2fd3d71d0ca63d99cdd52416fb567e4c8a0a2e2
Author: EdColeman <de...@etcoleman.com>
AuthorDate: Fri Oct 7 08:43:12 2022 -0400
Add log4j-core as a test dependency where needed (#3000)
Add log4j-core as a test dependency where needed
Due to https://issues.apache.org/jira/browse/LOG4J2-3601 we need to add
log4j-core to all modules that have a test dependency on
log4j-slf4j2-impl, but not a dependency on accumulo-monitor, as
log4j-slf4j2-impl no longer has a runtime dependency on log4j-core.
Co-authored-by: Christopher L. Shannon (cshannon) <ch...@gmail.com>
---
hadoop-mapreduce/pom.xml | 6 ++++++
iterator-test-harness/pom.xml | 6 ++++++
minicluster/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 ++++
13 files changed, 74 insertions(+)
diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml
index 702d0c541b..f542526c33 100644
--- a/hadoop-mapreduce/pom.xml
+++ b/hadoop-mapreduce/pom.xml
@@ -71,6 +71,12 @@
<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 6f0089e160..9dd9b57a8c 100644
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@ -59,6 +59,12 @@
<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 641ad29ee1..55db881dcd 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -129,6 +129,10 @@
<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/server/base/pom.xml b/server/base/pom.xml
index fe2b1da9e3..6579f48c0f 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -117,6 +117,12 @@
<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 38fb07ca49..02c20d1396 100644
--- a/server/compaction-coordinator/pom.xml
+++ b/server/compaction-coordinator/pom.xml
@@ -76,6 +76,12 @@
<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 6a9efe11c8..cd13df744a 100644
--- a/server/compactor/pom.xml
+++ b/server/compactor/pom.xml
@@ -79,6 +79,12 @@
<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 aac6587072..171d3c4e05 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -89,6 +89,12 @@
<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 3197219820..fe132bf69b 100644
--- a/server/manager/pom.xml
+++ b/server/manager/pom.xml
@@ -109,6 +109,12 @@
<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 f0ae20b8fa..25b3ecfc61 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -40,6 +40,12 @@
<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 22b9447e87..bfcefd068d 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -118,6 +118,12 @@
<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 0e3d27daec..773ae756d7 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -101,6 +101,12 @@
<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 0f1063ee47..307660e6aa 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -69,6 +69,12 @@
<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 299469f43f..91c8e716dd 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -220,6 +220,10 @@
<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>