This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new aa011e6 CAMEL-14317: remove log4j1 (#4079)
aa011e6 is described below
commit aa011e6f47ebc1ee457c21e2782ad4b46b34f0a0
Author: Zineb BENDHIBA <bendhiba.zi...@gmail.com>
AuthorDate: Fri Aug 7 14:27:20 2020 +0200
CAMEL-14317: remove log4j1 (#4079)
---
camel-dependencies/pom.xml | 1 -
components/camel-activemq/pom.xml | 4 ++++
components/camel-asterisk/pom.xml | 6 ++++++
components/camel-hdfs/pom.xml | 10 ++++++++++
parent/pom.xml | 6 ------
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0f4c8eb..3731b39 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -390,7 +390,6 @@
<libthrift-version>0.12.0</libthrift-version>
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<lightcouch-version>0.2.0</lightcouch-version>
- <log4j-version>1.2.17</log4j-version>
<log4j2-version>2.13.3</log4j2-version>
<logback-version>1.2.3</logback-version>
<lucene-version>8.5.1</lucene-version>
diff --git a/components/camel-activemq/pom.xml
b/components/camel-activemq/pom.xml
index 7fafc26..919eece 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -81,6 +81,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/components/camel-asterisk/pom.xml
b/components/camel-asterisk/pom.xml
index 06921a0..2906a54 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -47,6 +47,12 @@
<groupId>org.asteriskjava</groupId>
<artifactId>asterisk-java</artifactId>
<version>${asterisk-java-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 2194670..5297fe0 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -72,6 +72,10 @@
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
@@ -86,6 +90,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop3-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7b187fd..85e9af0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -371,7 +371,6 @@
<!-- virtual dependency only used by Eclipse m2e -->
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<lettuce-version>5.1.0.RELEASE</lettuce-version>
- <log4j-version>1.2.17</log4j-version>
<log4j2-version>2.13.3</log4j2-version>
<logback-version>1.2.3</logback-version>
<lucene3-version>3.6.0</lucene3-version>
@@ -2991,11 +2990,6 @@
<version>${slf4j-version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2-version}</version>
