This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new c434747b722 CAMEL-18932: Upgrade to slf4j v2 and adjust log4j2
c434747b722 is described below
commit c434747b722497bfe033f6d0f14eda04a1d65f90
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jan 16 20:32:30 2023 +0100
CAMEL-18932: Upgrade to slf4j v2 and adjust log4j2
---
catalog/camel-catalog-provider-springboot/pom.xml | 2 +-
components-starter/camel-any23-starter/pom.xml | 4 ----
components-starter/camel-as2-starter/pom.xml | 2 +-
components-starter/camel-kamelet-starter/pom.xml | 2 +-
components-starter/camel-master-starter/pom.xml | 2 +-
components-starter/camel-pulsar-starter/pom.xml | 8 ++++++++
components-starter/camel-webhook-starter/pom.xml | 2 +-
.../apache/camel/itest/springboot/util/ArquillianPackager.java | 4 ++--
tooling/camel-spring-boot-dependencies/pom.xml | 4 ++--
tooling/camel-spring-boot-generator-maven-plugin/pom.xml | 2 +-
.../org/apache/camel/springboot/maven/SpringBootStarterMojo.java | 2 +-
11 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/pom.xml
b/catalog/camel-catalog-provider-springboot/pom.xml
index ce7d976bf5e..9a7ef6c186d 100644
--- a/catalog/camel-catalog-provider-springboot/pom.xml
+++ b/catalog/camel-catalog-provider-springboot/pom.xml
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components-starter/camel-any23-starter/pom.xml
b/components-starter/camel-any23-starter/pom.xml
index ae1c32059fc..673122b3511 100644
--- a/components-starter/camel-any23-starter/pom.xml
+++ b/components-starter/camel-any23-starter/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git a/components-starter/camel-as2-starter/pom.xml
b/components-starter/camel-as2-starter/pom.xml
index ebc07899876..36cd046fd8b 100644
--- a/components-starter/camel-as2-starter/pom.xml
+++ b/components-starter/camel-as2-starter/pom.xml
@@ -46,7 +46,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
</exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
diff --git a/components-starter/camel-kamelet-starter/pom.xml
b/components-starter/camel-kamelet-starter/pom.xml
index e0ff67fab3a..a36c4dddafb 100644
--- a/components-starter/camel-kamelet-starter/pom.xml
+++ b/components-starter/camel-kamelet-starter/pom.xml
@@ -106,7 +106,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components-starter/camel-master-starter/pom.xml
b/components-starter/camel-master-starter/pom.xml
index 2dde253fb89..b0a3006320f 100644
--- a/components-starter/camel-master-starter/pom.xml
+++ b/components-starter/camel-master-starter/pom.xml
@@ -42,7 +42,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components-starter/camel-pulsar-starter/pom.xml
b/components-starter/camel-pulsar-starter/pom.xml
index 7caa0936c34..0f67dfa8a6a 100644
--- a/components-starter/camel-pulsar-starter/pom.xml
+++ b/components-starter/camel-pulsar-starter/pom.xml
@@ -38,6 +38,14 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-pulsar</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-webhook-starter/pom.xml
b/components-starter/camel-webhook-starter/pom.xml
index 5054860c6c9..c1de6897a16 100644
--- a/components-starter/camel-webhook-starter/pom.xml
+++ b/components-starter/camel-webhook-starter/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 9a462b5686b..d78ea01f322 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -150,10 +150,10 @@ public final class ArquillianPackager {
commonExclusions.add(MavenDependencies.createExclusion("commons-logging",
"commons-logging"));
commonExclusions.add(MavenDependencies.createExclusion("org.slf4j",
"slf4j-log4j12"));
commonExclusions.add(MavenDependencies.createExclusion("log4j",
"log4j"));
- commonExclusions.add(MavenDependencies.createExclusion("log4j",
"log4j-slf4j-impl"));
+ commonExclusions.add(MavenDependencies.createExclusion("log4j",
"log4j-slf4j2-impl"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j-core"));
-
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j-slf4j-impl"));
+
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j-slf4j2-impl"));
commonExclusions.add(MavenDependencies.createExclusion("log4j",
"apache-log4j-extras"));
commonExclusions.add(MavenDependencies.createExclusion("org.slf4j",
"slf4j-simple"));
commonExclusions.add(MavenDependencies.createExclusion("org.slf4j",
"slf4j-jdk14"));
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 595ea2f5add..7276d855296 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4276,12 +4276,12 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
- <version>2.10.3</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-admin</artifactId>
- <version>2.10.3</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
index 0387491d60e..2285e811526 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
+++ b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
@@ -203,7 +203,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
index 556d8ef2cf8..7ab696ab084 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
@@ -237,7 +237,7 @@ public class SpringBootStarterMojo extends
AbstractSpringBootGenerator {
loggingImpl.add("org.apache.logging.log4j:log4j");
loggingImpl.add("org.apache.logging.log4j:log4j-jcl");
loggingImpl.add("org.apache.logging.log4j:log4j-core");
- loggingImpl.add("org.apache.logging.log4j:log4j-slf4j-impl");
+ loggingImpl.add("org.apache.logging.log4j:log4j-slf4j2-impl");
loggingImpl.add("org.slf4j:slf4j-jcl");
loggingImpl.add("org.slf4j:slf4j-jdk14");