This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ca141f3a9e909a5736d18d51eff752981db77260 Author: James Netherton <[email protected]> AuthorDate: Fri Jan 7 11:22:18 2022 +0000 Ban javax.activation:javax.activation-api --- extensions-jvm/cmis/runtime/pom.xml | 10 ++++++++++ extensions-jvm/hbase/runtime/pom.xml | 10 ++++++++++ extensions-jvm/hdfs/runtime/pom.xml | 10 ++++++++++ extensions-jvm/jooq/runtime/pom.xml | 10 ++++++++++ extensions-jvm/spark/runtime/pom.xml | 8 ++++++++ extensions/twilio/runtime/pom.xml | 10 ++++++++++ pom.xml | 1 + 7 files changed, 59 insertions(+) diff --git a/extensions-jvm/cmis/runtime/pom.xml b/extensions-jvm/cmis/runtime/pom.xml index 38ceec2..a21eb04 100644 --- a/extensions-jvm/cmis/runtime/pom.xml +++ b/extensions-jvm/cmis/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cmis</artifactId> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/hbase/runtime/pom.xml b/extensions-jvm/hbase/runtime/pom.xml index ff3541f..ffbcaf2 100644 --- a/extensions-jvm/hbase/runtime/pom.xml +++ b/extensions-jvm/hbase/runtime/pom.xml @@ -62,6 +62,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-hbase</artifactId> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> <groupId>org.graalvm.nativeimage</groupId> diff --git a/extensions-jvm/hdfs/runtime/pom.xml b/extensions-jvm/hdfs/runtime/pom.xml index f59af8d..4e507c4 100644 --- a/extensions-jvm/hdfs/runtime/pom.xml +++ b/extensions-jvm/hdfs/runtime/pom.xml @@ -58,6 +58,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-hdfs</artifactId> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/jooq/runtime/pom.xml b/extensions-jvm/jooq/runtime/pom.xml index c13324a..0ca6908 100644 --- a/extensions-jvm/jooq/runtime/pom.xml +++ b/extensions-jvm/jooq/runtime/pom.xml @@ -54,6 +54,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jooq</artifactId> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> </dependencies> diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml index 72ce49b..036bcf3 100644 --- a/extensions-jvm/spark/runtime/pom.xml +++ b/extensions-jvm/spark/runtime/pom.xml @@ -84,6 +84,10 @@ <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -91,6 +95,10 @@ <artifactId>jakarta.activation</artifactId> </dependency> <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.ws.rs</groupId> <artifactId>jboss-jaxrs-api_2.1_spec</artifactId> </dependency> diff --git a/extensions/twilio/runtime/pom.xml b/extensions/twilio/runtime/pom.xml index 0b4e2f2..9dbdda0 100644 --- a/extensions/twilio/runtime/pom.xml +++ b/extensions/twilio/runtime/pom.xml @@ -63,6 +63,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-twilio</artifactId> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 433c411..7512678 100644 --- a/pom.xml +++ b/pom.xml @@ -667,6 +667,7 @@ <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.activation:javax.activation-api</exclude><!-- use jakarta.activation:jakarta.annotation-api 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 --> <exclude>org.apache.geronimo.specs:geronimo-jms_2.0_spec</exclude><!-- use jakarta.jms:jakarta.jms-api instead -->
