You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2021/12/07 23:14:02 UTC
[camel-quarkus] branch main updated (554ace1 -> c36f034)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 554ace1 Workaround for NoSuchFileException: .../target/classes when executing a codegen task https://github.com/quarkusio/quarkus/issues/21718
new 9902f21 Ban com.sun.activation:javax.activation #3361
new d9b9921 Ban geronimo-jms_*_spec #3363
new c36f034 Ban javax.enterprise:cdi-api in favor of jakarta.enterprise:jakarta.enterprise.cdi-api #3364
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
extensions-core/http-common/runtime/pom.xml | 11 +++++++++++
extensions-jvm/pulsar/runtime/pom.xml | 10 ++++++++++
extensions-jvm/spark/runtime/pom.xml | 10 ++++++++++
extensions/activemq/runtime/pom.xml | 12 ++++++++++--
extensions/amqp/deployment/pom.xml | 10 ++++++++++
extensions/amqp/runtime/pom.xml | 10 ++++++++++
extensions/attachments/runtime/pom.xml | 10 ++++++++++
extensions/jms/runtime/pom.xml | 10 ++++++++++
extensions/mail/runtime/pom.xml | 10 ++++++++++
extensions/microprofile-health/runtime/pom.xml | 10 ++++++++++
extensions/servlet/runtime/pom.xml | 10 ++++++++++
extensions/solr/runtime/pom.xml | 10 ++++++++++
integration-tests/jms-qpid-amqp-client/pom.xml | 10 ++++++++++
integration-tests/messaging/common/pom.xml | 5 ++---
integration-tests/messaging/jms/pom.xml | 5 -----
integration-tests/messaging/sjms/pom.xml | 5 -----
integration-tests/sjms-qpid-amqp-client/pom.xml | 10 ++++++++++
integration-tests/sjms2-qpid-amqp-client/pom.xml | 10 ++++++++++
pom.xml | 9 +++++++--
poms/bom-test/pom.xml | 5 -----
poms/bom/pom.xml | 5 +++++
21 files changed, 165 insertions(+), 22 deletions(-)
[camel-quarkus] 02/03: Ban geronimo-jms_*_spec #3363
Posted by pp...@apache.org.
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 d9b99216b9328c89fd6f4c96fdc2e34c98bcb343
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Dec 7 15:23:19 2021 +0100
Ban geronimo-jms_*_spec #3363
---
extensions/activemq/runtime/pom.xml | 12 ++++++++++--
extensions/amqp/deployment/pom.xml | 10 ++++++++++
extensions/amqp/runtime/pom.xml | 10 ++++++++++
extensions/jms/runtime/pom.xml | 10 ++++++++++
integration-tests/jms-qpid-amqp-client/pom.xml | 10 ++++++++++
integration-tests/messaging/common/pom.xml | 5 ++---
integration-tests/messaging/jms/pom.xml | 5 -----
integration-tests/messaging/sjms/pom.xml | 5 -----
integration-tests/sjms-qpid-amqp-client/pom.xml | 10 ++++++++++
integration-tests/sjms2-qpid-amqp-client/pom.xml | 10 ++++++++++
pom.xml | 6 ++++--
poms/bom-test/pom.xml | 5 -----
poms/bom/pom.xml | 5 +++++
13 files changed, 81 insertions(+), 22 deletions(-)
diff --git a/extensions/activemq/runtime/pom.xml b/extensions/activemq/runtime/pom.xml
index bdbdd94..a6fb0a1 100644
--- a/extensions/activemq/runtime/pom.xml
+++ b/extensions/activemq/runtime/pom.xml
@@ -65,16 +65,24 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-activemq</artifactId>
- <!-- remove broker as it brings some classes that brak native compilation -->
- <!-- we should investigate how to substitue JMX on ActiveMQ -->
<exclusions>
<exclusion>
+ <!-- remove broker as it brings some classes that brak native compilation -->
+ <!-- we should investigate how to substitue JMX on ActiveMQ -->
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
diff --git a/extensions/amqp/deployment/pom.xml b/extensions/amqp/deployment/pom.xml
index 3a90709..26a0ed8 100644
--- a/extensions/amqp/deployment/pom.xml
+++ b/extensions/amqp/deployment/pom.xml
@@ -33,6 +33,16 @@
<dependency>
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms-deployment</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/amqp/runtime/pom.xml b/extensions/amqp/runtime/pom.xml
index 4980aa6..481d6ee 100644
--- a/extensions/amqp/runtime/pom.xml
+++ b/extensions/amqp/runtime/pom.xml
@@ -50,6 +50,16 @@
<dependency>
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/jms/runtime/pom.xml b/extensions/jms/runtime/pom.xml
index 7f59dd3..292075f 100644
--- a/extensions/jms/runtime/pom.xml
+++ b/extensions/jms/runtime/pom.xml
@@ -58,6 +58,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/integration-tests/jms-qpid-amqp-client/pom.xml b/integration-tests/jms-qpid-amqp-client/pom.xml
index 57f0060..d4d0ed2 100644
--- a/integration-tests/jms-qpid-amqp-client/pom.xml
+++ b/integration-tests/jms-qpid-amqp-client/pom.xml
@@ -47,6 +47,16 @@
<dependency>
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/messaging/common/pom.xml b/integration-tests/messaging/common/pom.xml
index 6597a93..9cad7df 100644
--- a/integration-tests/messaging/common/pom.xml
+++ b/integration-tests/messaging/common/pom.xml
@@ -51,9 +51,8 @@
<artifactId>camel-quarkus-xml-jaxp</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/integration-tests/messaging/jms/pom.xml b/integration-tests/messaging/jms/pom.xml
index aa1a379..6f4baa0 100644
--- a/integration-tests/messaging/jms/pom.xml
+++ b/integration-tests/messaging/jms/pom.xml
@@ -46,11 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/integration-tests/messaging/sjms/pom.xml b/integration-tests/messaging/sjms/pom.xml
index 317a531..f22d090 100644
--- a/integration-tests/messaging/sjms/pom.xml
+++ b/integration-tests/messaging/sjms/pom.xml
@@ -46,11 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/integration-tests/sjms-qpid-amqp-client/pom.xml b/integration-tests/sjms-qpid-amqp-client/pom.xml
index 29b1424..d8e3ff8 100644
--- a/integration-tests/sjms-qpid-amqp-client/pom.xml
+++ b/integration-tests/sjms-qpid-amqp-client/pom.xml
@@ -47,6 +47,16 @@
<dependency>
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/sjms2-qpid-amqp-client/pom.xml b/integration-tests/sjms2-qpid-amqp-client/pom.xml
index 6d60107..9449061 100644
--- a/integration-tests/sjms2-qpid-amqp-client/pom.xml
+++ b/integration-tests/sjms2-qpid-amqp-client/pom.xml
@@ -47,6 +47,16 @@
<dependency>
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/pom.xml b/pom.xml
index 43b5495..cf7fe25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,6 @@
<eddsa.version>${eddsa-version}</eddsa.version>
<freemarker.version>2.3.31</freemarker.version><!-- @sync io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse.freemarker.version} prop:freemarker.version -->
<fommil.netlib.core.version>1.1.2</fommil.netlib.core.version><!-- Mess in Weka transitive deps -->
- <jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive dependencies of Spark and Splunk -->
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
<google-native-image-support.version>0.8.0</google-native-image-support.version>
<google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
@@ -92,9 +91,11 @@
<htrace.version>4.2.0-incubating</htrace.version><!-- Mess in hbase transitive deps -->
<influxdb.version>${influx-java-driver-version}</influxdb.version>
<jackson-asl.version>1.9.13</jackson-asl.version><!-- Mess in the transitive dependencies of spark and hbase-testing-util -->
+ <jakarta.jms-api.version>2.0.3</jakarta.jms-api.version>
<jakarta.jws.ws.api.version>2.1.0</jakarta.jws.ws.api.version>
<jakarta.xml.ws.api.version>2.3.3</jakarta.xml.ws.api.version>
<jcodings.version>1.0.55</jcodings.version><!-- used by hbase -->
+ <jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive dependencies of Spark and Splunk -->
<joni.version>2.1.31</joni.version><!-- used by json-validator -->
<jsoup.version>1.12.1</jsoup.version><!-- used by oaipmh -->
<jaxen.version>1.2.0</jaxen.version>
@@ -135,7 +136,6 @@
<commons-logging.version>1.2</commons-logging.version><!-- Mess in the transitive dependencies of hbase-testing-util -->
<consul-client.version>${consul-client-version}</consul-client.version>
<ftpserver.version>1.1.1</ftpserver.version>
- <geronimo.jms.version>${geronimo-jms2-spec-version}</geronimo.jms.version>
<istack-commons-runtime.version>3.0.10</istack-commons-runtime.version>
<jakarta.mail.version>${jakarta-mail-version}</jakarta.mail.version>
<htmlunit-driver.version>2.47.1</htmlunit-driver.version>
@@ -653,6 +653,8 @@
<exclude>com.google.code.findbugs:jsr305</exclude>
<exclude>com.sun.activation:javax.activation</exclude><!-- use com.sun.activation:jakarta.activation instead -->
<exclude>javax.activation:activation</exclude><!-- use com.sun.activation:jakarta.activation 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 -->
</excludes>
</bannedDependencies>
</rules>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index ca93c82..3c917ad 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -163,11 +163,6 @@
<version>${ftpserver.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- <version>${geronimo.jms.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>${pdfbox.version}</version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index a5593e9..6511cd7 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6000,6 +6000,11 @@
<version>${smallrye.reactive.messaging.camel.version}</version>
</dependency>
<dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta.xml.ws.api.version}</version>
[camel-quarkus] 01/03: Ban com.sun.activation:javax.activation #3361
Posted by pp...@apache.org.
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 9902f21d38c7e4d203cac7680c0dbf7325623738
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Dec 7 14:28:27 2021 +0100
Ban com.sun.activation:javax.activation #3361
---
extensions-core/http-common/runtime/pom.xml | 11 +++++++++++
extensions-jvm/pulsar/runtime/pom.xml | 10 ++++++++++
extensions-jvm/spark/runtime/pom.xml | 10 ++++++++++
extensions/attachments/runtime/pom.xml | 10 ++++++++++
extensions/mail/runtime/pom.xml | 10 ++++++++++
extensions/servlet/runtime/pom.xml | 10 ++++++++++
extensions/solr/runtime/pom.xml | 10 ++++++++++
pom.xml | 2 ++
8 files changed, 73 insertions(+)
diff --git a/extensions-core/http-common/runtime/pom.xml b/extensions-core/http-common/runtime/pom.xml
index 19f1215..22650aa 100644
--- a/extensions-core/http-common/runtime/pom.xml
+++ b/extensions-core/http-common/runtime/pom.xml
@@ -55,6 +55,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
<!-- required for http-common type converters-->
diff --git a/extensions-jvm/pulsar/runtime/pom.xml b/extensions-jvm/pulsar/runtime/pom.xml
index ff3a446..8142d39 100644
--- a/extensions-jvm/pulsar/runtime/pom.xml
+++ b/extensions-jvm/pulsar/runtime/pom.xml
@@ -54,6 +54,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-pulsar</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
</dependencies>
diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml
index 3a24cb0..13d6d95 100644
--- a/extensions-jvm/spark/runtime/pom.xml
+++ b/extensions-jvm/spark/runtime/pom.xml
@@ -79,6 +79,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spark</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
diff --git a/extensions/attachments/runtime/pom.xml b/extensions/attachments/runtime/pom.xml
index a9eea6e..e977b2a 100644
--- a/extensions/attachments/runtime/pom.xml
+++ b/extensions/attachments/runtime/pom.xml
@@ -54,6 +54,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-attachments</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/mail/runtime/pom.xml b/extensions/mail/runtime/pom.xml
index 8bbfed2..5980701 100644
--- a/extensions/mail/runtime/pom.xml
+++ b/extensions/mail/runtime/pom.xml
@@ -58,6 +58,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mail</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/servlet/runtime/pom.xml b/extensions/servlet/runtime/pom.xml
index c5b421c..384309a 100644
--- a/extensions/servlet/runtime/pom.xml
+++ b/extensions/servlet/runtime/pom.xml
@@ -57,6 +57,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/solr/runtime/pom.xml b/extensions/solr/runtime/pom.xml
index 657cded..9e3d3ef 100644
--- a/extensions/solr/runtime/pom.xml
+++ b/extensions/solr/runtime/pom.xml
@@ -55,6 +55,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-solr</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/pom.xml b/pom.xml
index cd15b4b..43b5495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -651,6 +651,8 @@
<bannedDependencies>
<excludes>
<exclude>com.google.code.findbugs:jsr305</exclude>
+ <exclude>com.sun.activation:javax.activation</exclude><!-- use com.sun.activation:jakarta.activation instead -->
+ <exclude>javax.activation:activation</exclude><!-- use com.sun.activation:jakarta.activation instead -->
</excludes>
</bannedDependencies>
</rules>
[camel-quarkus] 03/03: Ban javax.enterprise:cdi-api in favor of jakarta.enterprise:jakarta.enterprise.cdi-api #3364
Posted by pp...@apache.org.
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 c36f034aa75f9385e5c99c1002705a5927b9b5e1
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Dec 7 15:38:05 2021 +0100
Ban javax.enterprise:cdi-api in favor of jakarta.enterprise:jakarta.enterprise.cdi-api #3364
---
extensions/microprofile-health/runtime/pom.xml | 10 ++++++++++
pom.xml | 1 +
2 files changed, 11 insertions(+)
diff --git a/extensions/microprofile-health/runtime/pom.xml b/extensions/microprofile-health/runtime/pom.xml
index 0f18d4a..068e654 100644
--- a/extensions/microprofile-health/runtime/pom.xml
+++ b/extensions/microprofile-health/runtime/pom.xml
@@ -60,6 +60,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-health</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index cf7fe25..3e0eacd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -655,6 +655,7 @@
<exclude>javax.activation:activation</exclude><!-- use com.sun.activation:jakarta.activation 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 -->
+ <exclude>javax.enterprise:cdi-api</exclude><!-- use jakarta.enterprise:jakarta.enterprise.cdi-api instead -->
</excludes>
</bannedDependencies>
</rules>