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 2a7b6efd7158386b131425e4bbaaf274f6f99f39 Author: Peter Palaga <[email protected]> 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-artemis-client/pom.xml | 6 ++++++ integration-tests/jms-qpid-amqp-client/pom.xml | 10 ++++++++++ integration-tests/jta/pom.xml | 6 ++++++ integration-tests/messaging/common/pom.xml | 5 ++--- integration-tests/messaging/jms/pom.xml | 5 ----- integration-tests/messaging/sjms/pom.xml | 5 ----- integration-tests/sjms-artemis-client/pom.xml | 6 ++++++ integration-tests/sjms-qpid-amqp-client/pom.xml | 10 ++++++++++ integration-tests/sjms2-artemis-client/pom.xml | 6 ++++++ integration-tests/sjms2-qpid-amqp-client/pom.xml | 10 ++++++++++ pom.xml | 6 ++++-- poms/bom-test/pom.xml | 5 ----- poms/bom/pom.xml | 5 +++++ 17 files changed, 105 insertions(+), 22 deletions(-) diff --git a/extensions/activemq/runtime/pom.xml b/extensions/activemq/runtime/pom.xml index 77f5af1..358f892 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 9c12911..634e5b1 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 99bb992..92de778 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 35f1c8b..d5537ed 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-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml index 28219ab..a4bd7c7 100644 --- a/integration-tests/jms-artemis-client/pom.xml +++ b/integration-tests/jms-artemis-client/pom.xml @@ -46,6 +46,12 @@ <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-artemis-jms</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test dependencies --> diff --git a/integration-tests/jms-qpid-amqp-client/pom.xml b/integration-tests/jms-qpid-amqp-client/pom.xml index cb76a8a..7961098 100644 --- a/integration-tests/jms-qpid-amqp-client/pom.xml +++ b/integration-tests/jms-qpid-amqp-client/pom.xml @@ -46,6 +46,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/jta/pom.xml b/integration-tests/jta/pom.xml index 4e5d524..b2de9cc 100644 --- a/integration-tests/jta/pom.xml +++ b/integration-tests/jta/pom.xml @@ -78,6 +78,12 @@ <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-artemis-jms</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test dependencies --> diff --git a/integration-tests/messaging/common/pom.xml b/integration-tests/messaging/common/pom.xml index 037db4f..04b1021 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 83ada07..66ea76f 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 f79ea1b..7f01e50 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-artemis-client/pom.xml b/integration-tests/sjms-artemis-client/pom.xml index 6c82650..de1735b 100644 --- a/integration-tests/sjms-artemis-client/pom.xml +++ b/integration-tests/sjms-artemis-client/pom.xml @@ -46,6 +46,12 @@ <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-artemis-jms</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test dependencies --> diff --git a/integration-tests/sjms-qpid-amqp-client/pom.xml b/integration-tests/sjms-qpid-amqp-client/pom.xml index 3f06958..db41cd6 100644 --- a/integration-tests/sjms-qpid-amqp-client/pom.xml +++ b/integration-tests/sjms-qpid-amqp-client/pom.xml @@ -46,6 +46,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-artemis-client/pom.xml b/integration-tests/sjms2-artemis-client/pom.xml index 362115a..11ec6b4 100644 --- a/integration-tests/sjms2-artemis-client/pom.xml +++ b/integration-tests/sjms2-artemis-client/pom.xml @@ -46,6 +46,12 @@ <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-artemis-jms</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test dependencies --> diff --git a/integration-tests/sjms2-qpid-amqp-client/pom.xml b/integration-tests/sjms2-qpid-amqp-client/pom.xml index 46be793..94c7767 100644 --- a/integration-tests/sjms2-qpid-amqp-client/pom.xml +++ b/integration-tests/sjms2-qpid-amqp-client/pom.xml @@ -46,6 +46,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 6d46a06..295b3b8 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,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 --> <guava.version>29.0-jre</guava.version> <graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm --> @@ -87,9 +86,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> @@ -131,7 +132,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> @@ -650,6 +650,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 de43e20..86e4cd2 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 0c42d16..b64264a 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -5937,6 +5937,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>
