This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b20242aedbba5db5f0ed8e86dd91a780920d1ca4 Author: Peter Palaga <[email protected]> AuthorDate: Tue Dec 21 18:37:05 2021 +0100 Ban commons-logging and commons-logging-api #3405 --- extensions-jvm/atmos/runtime/pom.xml | 10 ++++++++++ extensions-jvm/aws-secrets-manager/runtime/pom.xml | 10 ++++++++++ extensions-jvm/cm-sms/runtime/pom.xml | 10 ++++++++++ extensions-jvm/google-functions/runtime/pom.xml | 10 ++++++++++ extensions-jvm/iota/runtime/pom.xml | 10 ++++++++++ extensions-jvm/ribbon/runtime/pom.xml | 10 ++++++++++ extensions-jvm/splunk-hec/runtime/pom.xml | 10 ++++++++++ extensions-jvm/thrift/runtime/pom.xml | 10 ++++++++++ extensions-jvm/workday/runtime/pom.xml | 8 ++++++++ extensions/as2/runtime/pom.xml | 8 ++++++++ extensions/aws2-athena/runtime/pom.xml | 10 ++++++++++ extensions/aws2-cw/runtime/pom.xml | 10 ++++++++++ extensions/aws2-ddb/runtime/pom.xml | 10 ++++++++++ extensions/aws2-ec2/runtime/pom.xml | 10 ++++++++++ extensions/aws2-ecs/runtime/pom.xml | 10 ++++++++++ extensions/aws2-eks/runtime/pom.xml | 10 ++++++++++ extensions/aws2-eventbridge/runtime/pom.xml | 10 ++++++++++ extensions/aws2-iam/runtime/pom.xml | 10 ++++++++++ extensions/aws2-kinesis/runtime/pom.xml | 10 ++++++++++ extensions/aws2-kms/runtime/pom.xml | 10 ++++++++++ extensions/aws2-lambda/runtime/pom.xml | 10 ++++++++++ extensions/aws2-mq/runtime/pom.xml | 10 ++++++++++ extensions/aws2-msk/runtime/pom.xml | 10 ++++++++++ extensions/aws2-s3/runtime/pom.xml | 10 ++++++++++ extensions/aws2-ses/runtime/pom.xml | 10 ++++++++++ extensions/aws2-sns/runtime/pom.xml | 10 ++++++++++ extensions/aws2-sqs/runtime/pom.xml | 10 ++++++++++ extensions/aws2-sts/runtime/pom.xml | 10 ++++++++++ extensions/aws2-translate/runtime/pom.xml | 10 ++++++++++ extensions/box/runtime/pom.xml | 10 ++++++++++ extensions/grpc/runtime/pom.xml | 8 ++++++++ extensions/hystrix/runtime/pom.xml | 10 ++++++++++ integration-tests-support/wiremock/pom.xml | 10 ++++++++++ integration-tests/fop/pom.xml | 10 ++++++++++ pom.xml | 2 ++ 35 files changed, 336 insertions(+) diff --git a/extensions-jvm/atmos/runtime/pom.xml b/extensions-jvm/atmos/runtime/pom.xml index be44971..7957296 100644 --- a/extensions-jvm/atmos/runtime/pom.xml +++ b/extensions-jvm/atmos/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-atmos</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <!-- Replacement for javax.ws.rs:jsr311-api pulled by jersey-core --> diff --git a/extensions-jvm/aws-secrets-manager/runtime/pom.xml b/extensions-jvm/aws-secrets-manager/runtime/pom.xml index 34ad4b5..5a43058 100644 --- a/extensions-jvm/aws-secrets-manager/runtime/pom.xml +++ b/extensions-jvm/aws-secrets-manager/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws-secrets-manager</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/cm-sms/runtime/pom.xml b/extensions-jvm/cm-sms/runtime/pom.xml index 5d05c62..4240cc7 100644 --- a/extensions-jvm/cm-sms/runtime/pom.xml +++ b/extensions-jvm/cm-sms/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cm-sms</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/google-functions/runtime/pom.xml b/extensions-jvm/google-functions/runtime/pom.xml index b0fc234..90ac2f9 100644 --- a/extensions-jvm/google-functions/runtime/pom.xml +++ b/extensions-jvm/google-functions/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-functions</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/iota/runtime/pom.xml b/extensions-jvm/iota/runtime/pom.xml index 4c4e096..24b4e60 100644 --- a/extensions-jvm/iota/runtime/pom.xml +++ b/extensions-jvm/iota/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-iota</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/ribbon/runtime/pom.xml b/extensions-jvm/ribbon/runtime/pom.xml index da7a16d..dc24b43 100644 --- a/extensions-jvm/ribbon/runtime/pom.xml +++ b/extensions-jvm/ribbon/runtime/pom.xml @@ -58,6 +58,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-ribbon</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/splunk-hec/runtime/pom.xml b/extensions-jvm/splunk-hec/runtime/pom.xml index b67ff9a..a3cf931 100644 --- a/extensions-jvm/splunk-hec/runtime/pom.xml +++ b/extensions-jvm/splunk-hec/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-splunk-hec</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/thrift/runtime/pom.xml b/extensions-jvm/thrift/runtime/pom.xml index e751f8a..146617a 100644 --- a/extensions-jvm/thrift/runtime/pom.xml +++ b/extensions-jvm/thrift/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-thrift</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/workday/runtime/pom.xml b/extensions-jvm/workday/runtime/pom.xml index a8a35c9..958fdc4 100644 --- a/extensions-jvm/workday/runtime/pom.xml +++ b/extensions-jvm/workday/runtime/pom.xml @@ -59,9 +59,17 @@ <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.bind</groupId> <artifactId>jboss-jaxb-api_2.3_spec</artifactId> </dependency> diff --git a/extensions/as2/runtime/pom.xml b/extensions/as2/runtime/pom.xml index 779af7c..faca16b 100644 --- a/extensions/as2/runtime/pom.xml +++ b/extensions/as2/runtime/pom.xml @@ -64,9 +64,17 @@ <groupId>org.bouncycastle</groupId> <artifactId>bcprov-debug-jdk15on</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-support-bouncycastle</artifactId> </dependency> diff --git a/extensions/aws2-athena/runtime/pom.xml b/extensions/aws2-athena/runtime/pom.xml index 29e2531..38fa9e2 100644 --- a/extensions/aws2-athena/runtime/pom.xml +++ b/extensions/aws2-athena/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-athena</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-cw/runtime/pom.xml b/extensions/aws2-cw/runtime/pom.xml index 49cb624..dc12e28 100644 --- a/extensions/aws2-cw/runtime/pom.xml +++ b/extensions/aws2-cw/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-cw</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-ddb/runtime/pom.xml b/extensions/aws2-ddb/runtime/pom.xml index 31572e8..48231ac 100644 --- a/extensions/aws2-ddb/runtime/pom.xml +++ b/extensions/aws2-ddb/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-ddb</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-ec2/runtime/pom.xml b/extensions/aws2-ec2/runtime/pom.xml index 8649327..83b4716 100644 --- a/extensions/aws2-ec2/runtime/pom.xml +++ b/extensions/aws2-ec2/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-ec2</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-ecs/runtime/pom.xml b/extensions/aws2-ecs/runtime/pom.xml index 6100a72..7bbfc12 100644 --- a/extensions/aws2-ecs/runtime/pom.xml +++ b/extensions/aws2-ecs/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-ecs</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-eks/runtime/pom.xml b/extensions/aws2-eks/runtime/pom.xml index 03dd9a1..14548ed 100644 --- a/extensions/aws2-eks/runtime/pom.xml +++ b/extensions/aws2-eks/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-eks</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-eventbridge/runtime/pom.xml b/extensions/aws2-eventbridge/runtime/pom.xml index 63e9d9f..0361db3 100644 --- a/extensions/aws2-eventbridge/runtime/pom.xml +++ b/extensions/aws2-eventbridge/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-eventbridge</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions/aws2-iam/runtime/pom.xml b/extensions/aws2-iam/runtime/pom.xml index e87028f..c08e072 100644 --- a/extensions/aws2-iam/runtime/pom.xml +++ b/extensions/aws2-iam/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-iam</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-kinesis/runtime/pom.xml b/extensions/aws2-kinesis/runtime/pom.xml index 8868d3c..a80456f 100644 --- a/extensions/aws2-kinesis/runtime/pom.xml +++ b/extensions/aws2-kinesis/runtime/pom.xml @@ -56,6 +56,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-kinesis</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-kms/runtime/pom.xml b/extensions/aws2-kms/runtime/pom.xml index d655563..7ab8bf8 100644 --- a/extensions/aws2-kms/runtime/pom.xml +++ b/extensions/aws2-kms/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-kms</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-lambda/runtime/pom.xml b/extensions/aws2-lambda/runtime/pom.xml index 2c0b166..b1cd6fe 100644 --- a/extensions/aws2-lambda/runtime/pom.xml +++ b/extensions/aws2-lambda/runtime/pom.xml @@ -59,6 +59,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-lambda</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions/aws2-mq/runtime/pom.xml b/extensions/aws2-mq/runtime/pom.xml index 7a6e614..4cf0484 100644 --- a/extensions/aws2-mq/runtime/pom.xml +++ b/extensions/aws2-mq/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-mq</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-msk/runtime/pom.xml b/extensions/aws2-msk/runtime/pom.xml index 95c554a..d62b435 100644 --- a/extensions/aws2-msk/runtime/pom.xml +++ b/extensions/aws2-msk/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-msk</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-s3/runtime/pom.xml b/extensions/aws2-s3/runtime/pom.xml index 2a8c7a2..60fa391 100644 --- a/extensions/aws2-s3/runtime/pom.xml +++ b/extensions/aws2-s3/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-s3</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-ses/runtime/pom.xml b/extensions/aws2-ses/runtime/pom.xml index f4a4143..48431ed 100644 --- a/extensions/aws2-ses/runtime/pom.xml +++ b/extensions/aws2-ses/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-ses</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-sns/runtime/pom.xml b/extensions/aws2-sns/runtime/pom.xml index 454368b..ea314a4 100644 --- a/extensions/aws2-sns/runtime/pom.xml +++ b/extensions/aws2-sns/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-sns</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-sqs/runtime/pom.xml b/extensions/aws2-sqs/runtime/pom.xml index 7c9c566..e5017b4 100644 --- a/extensions/aws2-sqs/runtime/pom.xml +++ b/extensions/aws2-sqs/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-sqs</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-sts/runtime/pom.xml b/extensions/aws2-sts/runtime/pom.xml index 0a7695d..a18d7a9 100644 --- a/extensions/aws2-sts/runtime/pom.xml +++ b/extensions/aws2-sts/runtime/pom.xml @@ -55,6 +55,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-sts</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/aws2-translate/runtime/pom.xml b/extensions/aws2-translate/runtime/pom.xml index 0c7d101..d5a1895 100644 --- a/extensions/aws2-translate/runtime/pom.xml +++ b/extensions/aws2-translate/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws2-translate</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/extensions/box/runtime/pom.xml b/extensions/box/runtime/pom.xml index ea08f88..e196139 100644 --- a/extensions/box/runtime/pom.xml +++ b/extensions/box/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-box</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> </dependencies> diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index 14008da..d791d27 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -73,9 +73,17 @@ <groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> + </dependency> + <dependency> <groupId>org.graalvm.nativeimage</groupId> <artifactId>svm</artifactId> <scope>provided</scope> diff --git a/extensions/hystrix/runtime/pom.xml b/extensions/hystrix/runtime/pom.xml index ba2d962..a6f9b75 100644 --- a/extensions/hystrix/runtime/pom.xml +++ b/extensions/hystrix/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-hystrix</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.graalvm.nativeimage</groupId> diff --git a/integration-tests-support/wiremock/pom.xml b/integration-tests-support/wiremock/pom.xml index e818bc4..d4b3533 100644 --- a/integration-tests-support/wiremock/pom.xml +++ b/integration-tests-support/wiremock/pom.xml @@ -53,6 +53,16 @@ <dependency> <groupId>com.github.tomakehurst</groupId> <artifactId>wiremock-jre8</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <dependency> <groupId>org.jboss.logging</groupId> diff --git a/integration-tests/fop/pom.xml b/integration-tests/fop/pom.xml index 1ce6051..1c8c7c1 100644 --- a/integration-tests/fop/pom.xml +++ b/integration-tests/fop/pom.xml @@ -67,6 +67,16 @@ <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>commons-logging-jboss-logging</artifactId> </dependency> <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> diff --git a/pom.xml b/pom.xml index 0225e70..d1b32b8 100644 --- a/pom.xml +++ b/pom.xml @@ -649,6 +649,8 @@ <excludes> <exclude>com.google.code.findbugs:jsr305</exclude> <exclude>com.sun.activation:javax.activation</exclude><!-- use com.sun.activation:jakarta.activation instead --> + <exclude>commons-logging:commons-logging</exclude><!-- use org.jboss.logging:commons-logging-jboss-logging instead of commons-logging and commons-logging-api --> + <exclude>commons-logging:commons-logging-api</exclude><!-- use org.jboss.logging:commons-logging-jboss-logging instead of commons-logging and commons-logging-api --> <exclude>javax.activation:activation</exclude><!-- use com.sun.activation:jakarta.activation instead --> <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 -->
