Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3870: mark -all client deps optional in distribution pom, avoid passing on clashing/duplicate deps

This commit is contained in:
Robbie Gemmell 2022-06-22 18:00:02 +01:00 committed by Gary Tully
parent 6d926719f4
commit d199bf3c8c
3 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
artemis-distribution/pom.xml
View File

@ -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>

10
tests/e2e-tests/pom.xml
View File

@ -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>

10
tests/smoke-tests/pom.xml
View File

@ -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>