This is an automated email from the ASF dual-hosted git repository.
robbie 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 6eb78a2634 ARTEMIS-3783: rationalise config for alternate jakarta spec
versions to simplify and align their use
6eb78a2634 is described below
commit 6eb78a26348db54164128c32c7321f1a8ae23c35
Author: Robbie Gemmell <[email protected]>
AuthorDate: Wed Apr 20 10:57:32 2022 +0100
ARTEMIS-3783: rationalise config for alternate jakarta spec versions to
simplify and align their use
---
artemis-jakarta-client-all/pom.xml | 2 +-
artemis-jakarta-client/pom.xml | 3 +--
artemis-jakarta-ra/pom.xml | 9 +++------
artemis-jakarta-server/pom.xml | 8 +++-----
artemis-jakarta-service-extensions/pom.xml | 6 ++----
pom.xml | 5 ++++-
6 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/artemis-jakarta-client-all/pom.xml
b/artemis-jakarta-client-all/pom.xml
index 0882f5cfee..e39c12b1c4 100644
--- a/artemis-jakarta-client-all/pom.xml
+++ b/artemis-jakarta-client-all/pom.xml
@@ -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>
diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
index 3fa9c7d22b..e767aca745 100644
--- a/artemis-jakarta-client/pom.xml
+++ b/artemis-jakarta-client/pom.xml
@@ -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>
diff --git a/artemis-jakarta-ra/pom.xml b/artemis-jakarta-ra/pom.xml
index 219951320c..67d6b35b87 100644
--- a/artemis-jakarta-ra/pom.xml
+++ b/artemis-jakarta-ra/pom.xml
@@ -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>
diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
index 88918b9152..961a0cf928 100644
--- a/artemis-jakarta-server/pom.xml
+++ b/artemis-jakarta-server/pom.xml
@@ -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>
diff --git a/artemis-jakarta-service-extensions/pom.xml
b/artemis-jakarta-service-extensions/pom.xml
index 6dda5785eb..4de289d116 100644
--- a/artemis-jakarta-service-extensions/pom.xml
+++ b/artemis-jakarta-service-extensions/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 69e7cce9b3..b712d217df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
