You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2022/06/23 08:42:20 UTC
[activemq-artemis] branch main updated: ARTEMIS-3870: mark -all client deps optional in distribution pom, avoid passing on clashing/duplicate deps
This is an automated email from the ASF dual-hosted git repository.
gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new d199bf3c8c ARTEMIS-3870: mark -all client deps optional in distribution pom, avoid passing on clashing/duplicate deps
d199bf3c8c is described below
commit d199bf3c8ca0946e4c9c051c07a870eb872274ff
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jun 22 18:00:02 2022 +0100
ARTEMIS-3870: mark -all client deps optional in distribution pom, avoid passing on clashing/duplicate deps
---
artemis-distribution/pom.xml | 27 +++++++++++++++++----------
tests/e2e-tests/pom.xml | 10 ----------
tests/smoke-tests/pom.xml | 10 ----------
3 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index c516d71baa..5296eeb69e 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -37,16 +37,6 @@
<dependencies>
<!-- ActiveMQ Artemis artifacts -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client-all</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jakarta-client-all</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-boot</artifactId>
@@ -127,6 +117,23 @@
<artifactId>artemis-website</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- Must be optional to avoid passing on, as they clash
+ with each other, and contain duplicates of their deps
+ with those from the original jms client dep -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client-all</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jakarta-client-all</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- dependencies -->
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/tests/e2e-tests/pom.xml b/tests/e2e-tests/pom.xml
index cc43a3be6f..dd3d82da88 100644
--- a/tests/e2e-tests/pom.xml
+++ b/tests/e2e-tests/pom.xml
@@ -48,16 +48,6 @@
<version>${project.version}</version>
<scope>compile</scope>
<type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jakarta-client-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 34298fc984..2be5cc24de 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -50,16 +50,6 @@
<version>${project.version}</version>
<scope>compile</scope>
<type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jakarta-client-all</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>