Integ: Jakarta Transaction API 1.3.1 (#22602)
Signed-off-by: Tom Jenkinson <tom.jenkinson@redhat.com>
diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml
index c1d36cf..d227da1 100644
--- a/appserver/admin/template/src/main/resources/config/default-web.xml
+++ b/appserver/admin/template/src/main/resources/config/default-web.xml
@@ -312,7 +312,7 @@
javax.resource-api.jar
javax.security.auth.message.jar
javax.security.jacc.jar
- javax.transaction-api.jar
+ jakarta.transaction-api.jar
javax.xml.rpc-api.jar
webservices-osgi.jar
weld-osgi-bundle.jar
diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml
index eff3d32..b5b5f92 100755
--- a/appserver/deployment/dol/pom.xml
+++ b/appserver/deployment/dol/pom.xml
@@ -118,8 +118,8 @@
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise.deploy</groupId>
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 4415c10..80b5da5 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -419,8 +419,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<optional>true</optional>
</dependency>
<!-- glassfish-common-full -->
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index b5a729e..75c3817 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -722,8 +722,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<optional>true</optional>
</dependency>
<!-- glassfish-jca -->
diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
index 6944fb8..044fd74 100644
--- a/appserver/extras/javaee/manifest-jar/pom.xml
+++ b/appserver/extras/javaee/manifest-jar/pom.xml
@@ -34,7 +34,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>../modules/javax.servlet-api.jar ../modules/endorsed/javax.annotation-api.jar ../modules/javax.ejb-api.jar ../modules/javax.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar ../modules/javax.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/javax.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/bean-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json-api.jar ../modules/javax.json.bind-api.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar ../modules/javax.inject.jar</Class-Path>
+ <Class-Path>../modules/javax.servlet-api.jar ../modules/endorsed/javax.annotation-api.jar ../modules/javax.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar ../modules/javax.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/javax.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/bean-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json-api.jar ../modules/javax.json.bind-api.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar ../modules/javax.inject.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
index 38faa04..062b710 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -671,8 +671,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/appserver/javaee-api/javax.javaee-web-api/pom.xml b/appserver/javaee-api/javax.javaee-web-api/pom.xml
index 25398ca..675d623 100644
--- a/appserver/javaee-api/javax.javaee-web-api/pom.xml
+++ b/appserver/javaee-api/javax.javaee-web-api/pom.xml
@@ -157,8 +157,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/persistence/cmp/internal-api/pom.xml b/appserver/persistence/cmp/internal-api/pom.xml
index d6b8f17..bd89485 100644
--- a/appserver/persistence/cmp/internal-api/pom.xml
+++ b/appserver/persistence/cmp/internal-api/pom.xml
@@ -44,8 +44,8 @@
<dependencies>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.persistence</groupId>
diff --git a/appserver/persistence/cmp/support-sqlstore/pom.xml b/appserver/persistence/cmp/support-sqlstore/pom.xml
index 7d4eba1..adf626a 100644
--- a/appserver/persistence/cmp/support-sqlstore/pom.xml
+++ b/appserver/persistence/cmp/support-sqlstore/pom.xml
@@ -104,8 +104,8 @@
<optional>true</optional> <!-- This ensures that antlr:antlr does not get packaged -->
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 3ee00c3..b559205 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -50,7 +50,7 @@
<javax.ejb-api.version>3.2.2</javax.ejb-api.version>
<javax.interceptor-api.version>1.2.2</javax.interceptor-api.version>
<javax.xml.rpc-api.version>1.1.2</javax.xml.rpc-api.version>
- <javax.transaction-api.version>1.3</javax.transaction-api.version>
+ <javax.transaction-api.version>1.3.1</javax.transaction-api.version>
<javax.faces-api.version>2.3</javax.faces-api.version>
<cdi-api.version>2.0</cdi-api.version>
<javax.inject.version>1</javax.inject.version>
@@ -260,15 +260,15 @@
</spec>
<spec>
<artifact>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${javax.transaction-api.version}</version>
</artifact>
<nonFinal>false</nonFinal>
<jarType>api</jarType>
<specVersion>${javax.transaction-api.version}</specVersion>
<specImplVersion>${javax.transaction-api.version}</specImplVersion>
- <apiPackage>javax.transaction</apiPackage>
+ <apiPackage>jakarta.transaction</apiPackage>
</spec>
<spec>
<artifact>
@@ -520,8 +520,8 @@
<version>${javax.interceptor-api.version}</version>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${javax.transaction-api.version}</version>
</dependency>
<dependency>
diff --git a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml
index 80d4d14..bbda0b7 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml
+++ b/appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml
@@ -79,8 +79,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml
index bcd4b09..afaac0e 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml
+++ b/appserver/tests/cdi/cases/preDestroyScoping/ear/pom.xml
@@ -79,8 +79,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/appserver/tests/hk2/cdi/ear/app/pom.xml b/appserver/tests/hk2/cdi/ear/app/pom.xml
index 4b56caf..fa89fec 100644
--- a/appserver/tests/hk2/cdi/ear/app/pom.xml
+++ b/appserver/tests/hk2/cdi/ear/app/pom.xml
@@ -112,8 +112,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/appserver/tests/paas/basic-jpa/pom.xml b/appserver/tests/paas/basic-jpa/pom.xml
index bba9e60..7b5f7ea 100644
--- a/appserver/tests/paas/basic-jpa/pom.xml
+++ b/appserver/tests/paas/basic-jpa/pom.xml
@@ -84,7 +84,7 @@
</systemPath>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
diff --git a/appserver/tests/paas/basic-shared-service-test/pom.xml b/appserver/tests/paas/basic-shared-service-test/pom.xml
index 5555b68..974375d 100644
--- a/appserver/tests/paas/basic-shared-service-test/pom.xml
+++ b/appserver/tests/paas/basic-shared-service-test/pom.xml
@@ -84,7 +84,7 @@
</systemPath>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml
index b688e93..fc4620f 100644
--- a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml
+++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml
@@ -84,7 +84,7 @@
</systemPath>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
diff --git a/appserver/tests/paas/external-and-shared-service/pom.xml b/appserver/tests/paas/external-and-shared-service/pom.xml
index b2f24fb..032b12f 100644
--- a/appserver/tests/paas/external-and-shared-service/pom.xml
+++ b/appserver/tests/paas/external-and-shared-service/pom.xml
@@ -84,7 +84,7 @@
</systemPath>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
diff --git a/appserver/tests/paas/lazy-shared-service-test/pom.xml b/appserver/tests/paas/lazy-shared-service-test/pom.xml
index 78ddab9..0d9cb05 100644
--- a/appserver/tests/paas/lazy-shared-service-test/pom.xml
+++ b/appserver/tests/paas/lazy-shared-service-test/pom.xml
@@ -84,7 +84,7 @@
</systemPath>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
diff --git a/appserver/transaction/internal-api/pom.xml b/appserver/transaction/internal-api/pom.xml
index 437f407..cea4b15 100644
--- a/appserver/transaction/internal-api/pom.xml
+++ b/appserver/transaction/internal-api/pom.xml
@@ -48,8 +48,8 @@
<artifactId>hk2-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
diff --git a/appserver/transaction/jta-xa/pom.xml b/appserver/transaction/jta-xa/pom.xml
index fb99ae4..156d815 100644
--- a/appserver/transaction/jta-xa/pom.xml
+++ b/appserver/transaction/jta-xa/pom.xml
@@ -62,8 +62,8 @@
<artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.transaction</groupId>
diff --git a/appserver/transaction/jta/pom.xml b/appserver/transaction/jta/pom.xml
index 331df9d..db7c85d 100644
--- a/appserver/transaction/jta/pom.xml
+++ b/appserver/transaction/jta/pom.xml
@@ -66,8 +66,8 @@
<artifactId>hk2-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
diff --git a/appserver/transaction/jts/pom.xml b/appserver/transaction/jts/pom.xml
index 4076415..f2811dd 100644
--- a/appserver/transaction/jts/pom.xml
+++ b/appserver/transaction/jts/pom.xml
@@ -66,8 +66,8 @@
<artifactId>hk2-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml
index f3bf868..61affb7 100644
--- a/appserver/web/weld-integration/pom.xml
+++ b/appserver/web/weld-integration/pom.xml
@@ -136,8 +136,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 3a538cc..9197cfc 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -363,7 +363,7 @@
<resolutionFuzziness>groupId</resolutionFuzziness>
<includes>
<include>javax.ejb</include>
- <include>javax.transaction</include>
+ <include>jakarta.transaction</include>
<include>javax.resource</include>
<include>javax.enterprise.concurrent</include>
<include>javax.ws.rs</include>
