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
The following commit(s) were added to refs/heads/main by this push:
new d8a96ba Tidy geronimo-jms_2.0_spec exclusions
d8a96ba is described below
commit d8a96ba5699c07765f502f6c7b815ba4525bca99
Author: Peter Palaga <ppal...@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 4cf4c37..0824a08 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 b4e33a9..4effc60 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 3714691..e738fd9 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 f1c34a1..645bfa5 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 2978811..a4c6073 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 52c979f..eb06831 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 49f4d1a..4415943 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 b114e2c..c86b529 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 314b7d2..3ad01ee 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 5a24099..46956d5 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 4618971..825f487 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 eead88e..9bd9ded 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -817,6 +817,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>
