This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 312dfd7177b88268372d86d48ff58706270fbbf5 Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Fri Dec 10 14:51:05 2021 +0100 Ban log4j-core and log4j-slf4j-impl #3377 --- extensions-jvm/corda/runtime/pom.xml | 14 ++++++++++++++ extensions/nats/runtime/pom.xml | 14 ++++++++++++++ extensions/nsq/runtime/pom.xml | 8 ++++++-- pom.xml | 4 ++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/extensions-jvm/corda/runtime/pom.xml b/extensions-jvm/corda/runtime/pom.xml index 909b3db..ea4c39a 100644 --- a/extensions-jvm/corda/runtime/pom.xml +++ b/extensions-jvm/corda/runtime/pom.xml @@ -52,8 +52,22 @@ <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>log4j2-jboss-logmanager</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-corda</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> diff --git a/extensions/nats/runtime/pom.xml b/extensions/nats/runtime/pom.xml index 6c58473..63daee7 100644 --- a/extensions/nats/runtime/pom.xml +++ b/extensions/nats/runtime/pom.xml @@ -53,8 +53,22 @@ <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>log4j2-jboss-logmanager</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-nats</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> diff --git a/extensions/nsq/runtime/pom.xml b/extensions/nsq/runtime/pom.xml index ffdae7c..1df1f02 100644 --- a/extensions/nsq/runtime/pom.xml +++ b/extensions/nsq/runtime/pom.xml @@ -53,8 +53,8 @@ <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>log4j2-jboss-logmanager</artifactId> + <groupId>org.jboss.logmanager</groupId> + <artifactId>log4j2-jboss-logmanager</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -64,6 +64,10 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index a95db4f..ef8e314 100644 --- a/pom.xml +++ b/pom.xml @@ -662,6 +662,10 @@ <exclude>javax.enterprise:cdi-api</exclude><!-- use jakarta.enterprise:jakarta.enterprise.cdi-api instead --> <exclude>org.apache.geronimo.specs:geronimo-jms_1.1_spec</exclude><!-- use jakarta.jms:jakarta.jms-api instead --> <exclude>org.apache.geronimo.specs:geronimo-jms_2.0_spec</exclude><!-- use jakarta.jms:jakarta.jms-api instead --> + <!-- Note that log4j-api should be always excluded and org.jboss.logmanager:log4j2-jboss-logmanager added instead --> + <!-- so that the version of log4j-api prefered by log4j2-jboss-logmanager is used --> + <exclude>org.apache.logging.log4j:log4j-core</exclude><!-- not needed on Quarkus --> + <exclude>org.apache.logging.log4j:log4j-slf4j-impl</exclude><!-- not needed on Quarkus --> </excludes> </bannedDependencies> </rules>