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

ARTEMIS-3783: rationalise config for alternate jakarta spec versions to simplify and align their use

This commit is contained in:
Robbie Gemmell 2022-04-20 10:57:32 +01:00
parent e97e239771
commit 6eb78a2634
6 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-jakarta-client-all/pom.xml
View File

@ -29,7 +29,7 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
</properties>
<dependencies>

3
artemis-jakarta-client/pom.xml
View File

@ -29,7 +29,7 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
</properties>
<dependencies>
@ -64,7 +64,6 @@
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
</dependency>
<dependency>

9
artemis-jakarta-ra/pom.xml
View File

@ -29,9 +29,9 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
<jakarta.transaction-api.version>${jakarta.transaction-api.version.alt}</jakarta.transaction-api.version>
<jakarta.resource-api.version>${jakarta.resource-api.version.alt}</jakarta.resource-api.version>
</properties>
@ -67,19 +67,16 @@
<dependency>
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
<version>${jakarta.resource-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

8
artemis-jakarta-server/pom.xml
View File

@ -29,9 +29,9 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
<jakarta.transaction-api.version>${jakarta.transaction-api.version.alt}</jakarta.transaction-api.version>
<jakarta.resource-api.version>${jakarta.resource-api.version.alt}</jakarta.resource-api.version>
</properties>
<dependencies>
@ -84,12 +84,10 @@
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version>
</dependency>
</dependencies>

6
artemis-jakarta-service-extensions/pom.xml
View File

@ -29,8 +29,8 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
<jakarta.transaction-api.version>${jakarta.transaction-api.version.alt}</jakarta.transaction-api.version>
</properties>
<dependencies>
@ -78,12 +78,10 @@
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

5
pom.xml
View File

@ -165,8 +165,11 @@
<testcontainers.version>1.16.3</testcontainers.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<!-- for JakrtaEE -->
<!-- for JakartaEE -->
<version.batavia>1.0.10.Final</version.batavia>
<jakarta.jms-api.version.alt>3.0.0</jakarta.jms-api.version.alt>
<jakarta.transaction-api.version.alt>2.0.0</jakarta.transaction-api.version.alt>
<jakarta.resource-api.version.alt>2.0.0</jakarta.resource-api.version.alt>
<!-- used on tests -->
<groovy.version>4.0.0</groovy.version>