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 2022/03/31 09:47:39 UTC
[camel-quarkus] 07/43: Tidy geronimo-jms_2.0_spec exclusions
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 74267851611fa91ac9eec3431e59c32f2958eb3c
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Mar 21 17:13:12 2022 +0100
Tidy geronimo-jms_2.0_spec exclusions
---
extensions-jvm/corda/runtime/pom.xml | 4 ----
extensions/activemq/deployment/pom.xml | 7 -------
extensions/activemq/runtime/pom.xml | 7 -------
extensions/amqp/deployment/pom.xml | 2 +-
extensions/amqp/runtime/pom.xml | 2 +-
extensions/jms/runtime/pom.xml | 6 ------
integration-tests/jms-artemis-client/pom.xml | 6 ------
integration-tests/jms-qpid-amqp-client/pom.xml | 2 +-
integration-tests/jta/pom.xml | 10 ----------
integration-tests/sjms-artemis-client/pom.xml | 10 ----------
integration-tests/sjms2-artemis-client/pom.xml | 10 ----------
poms/bom/pom.xml | 8 ++++++++
12 files changed, 11 insertions(+), 63 deletions(-)
diff --git a/extensions-jvm/corda/runtime/pom.xml b/extensions-jvm/corda/runtime/pom.xml
index ffee96c..f8321db 100644
--- a/extensions-jvm/corda/runtime/pom.xml
+++ b/extensions-jvm/corda/runtime/pom.xml
@@ -67,10 +67,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/extensions/activemq/deployment/pom.xml b/extensions/activemq/deployment/pom.xml
index 86ea5bb..c2ed2f8 100644
--- a/extensions/activemq/deployment/pom.xml
+++ b/extensions/activemq/deployment/pom.xml
@@ -37,13 +37,6 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-jms-deployment</artifactId>
- <!-- ActiveMQ is bound to JMS 1.1 -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/activemq/runtime/pom.xml b/extensions/activemq/runtime/pom.xml
index 7443e12..005aba1 100644
--- a/extensions/activemq/runtime/pom.xml
+++ b/extensions/activemq/runtime/pom.xml
@@ -54,13 +54,6 @@
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-jms</artifactId>
- <!-- ActiveMQ is bound to JMS 1.1 -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/amqp/deployment/pom.xml b/extensions/amqp/deployment/pom.xml
index 755aa1e..2bb1b45 100644
--- a/extensions/amqp/deployment/pom.xml
+++ b/extensions/amqp/deployment/pom.xml
@@ -34,7 +34,7 @@
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms-deployment</artifactId>
<exclusions>
- <exclusion>
+ <exclusion><!-- Remove this once https://github.com/apache/qpid-jms/pull/46 reaches us -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
diff --git a/extensions/amqp/runtime/pom.xml b/extensions/amqp/runtime/pom.xml
index 976cc92..5fa9132 100644
--- a/extensions/amqp/runtime/pom.xml
+++ b/extensions/amqp/runtime/pom.xml
@@ -51,7 +51,7 @@
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms</artifactId>
<exclusions>
- <exclusion>
+ <exclusion><!-- Remove this once https://github.com/apache/qpid-jms/pull/46 reaches us -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
diff --git a/extensions/jms/runtime/pom.xml b/extensions/jms/runtime/pom.xml
index f221ce0..2e63f0c 100644
--- a/extensions/jms/runtime/pom.xml
+++ b/extensions/jms/runtime/pom.xml
@@ -58,12 +58,6 @@
<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>
diff --git a/integration-tests/jms-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml
index 1670dac..4fc1740 100644
--- a/integration-tests/jms-artemis-client/pom.xml
+++ b/integration-tests/jms-artemis-client/pom.xml
@@ -47,12 +47,6 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-jms</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/integration-tests/jms-qpid-amqp-client/pom.xml b/integration-tests/jms-qpid-amqp-client/pom.xml
index b6a929c..9a26dcc 100644
--- a/integration-tests/jms-qpid-amqp-client/pom.xml
+++ b/integration-tests/jms-qpid-amqp-client/pom.xml
@@ -48,7 +48,7 @@
<groupId>org.amqphub.quarkus</groupId>
<artifactId>quarkus-qpid-jms</artifactId>
<exclusions>
- <exclusion>
+ <exclusion><!-- Remove this once https://github.com/apache/qpid-jms/pull/46 reaches us -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
diff --git a/integration-tests/jta/pom.xml b/integration-tests/jta/pom.xml
index 6edffa3..904776c 100644
--- a/integration-tests/jta/pom.xml
+++ b/integration-tests/jta/pom.xml
@@ -66,16 +66,6 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-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/sjms-artemis-client/pom.xml b/integration-tests/sjms-artemis-client/pom.xml
index e19b252..406f2b8 100644
--- a/integration-tests/sjms-artemis-client/pom.xml
+++ b/integration-tests/sjms-artemis-client/pom.xml
@@ -47,16 +47,6 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-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 20a4cab..042bc5f 100644
--- a/integration-tests/sjms2-artemis-client/pom.xml
+++ b/integration-tests/sjms2-artemis-client/pom.xml
@@ -47,16 +47,6 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-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/poms/bom/pom.xml b/poms/bom/pom.xml
index 408ca0f..0f0ba6f 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -812,6 +812,10 @@
<artifactId>*</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</exclusion>
@@ -1649,6 +1653,10 @@
<artifactId>camel-spring</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>