Integ: Jakarta JCA api 1.7.2 (#22608)
Signed-off-by: Steve Millidge <steve.millidge@payara.fish>
Fixes https://github.com/eclipse-ee4j/jca-api/issues/25
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 d227da1..2188e82 100644
--- a/appserver/admin/template/src/main/resources/config/default-web.xml
+++ b/appserver/admin/template/src/main/resources/config/default-web.xml
@@ -309,7 +309,7 @@
javax.mail.jar
javax.management.j2ee-api.jar
javax.persistence.jar
- javax.resource-api.jar
+ jakarta.resource-api.jar
javax.security.auth.message.jar
javax.security.jacc.jar
jakarta.transaction-api.jar
diff --git a/appserver/connectors/connectors-inbound-runtime/pom.xml b/appserver/connectors/connectors-inbound-runtime/pom.xml
index 3336a01..a6e5ba2 100644
--- a/appserver/connectors/connectors-inbound-runtime/pom.xml
+++ b/appserver/connectors/connectors-inbound-runtime/pom.xml
@@ -81,8 +81,8 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.ejb</groupId>
diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml
index 125ec0f..2a92444 100644
--- a/appserver/connectors/connectors-runtime/pom.xml
+++ b/appserver/connectors/connectors-runtime/pom.xml
@@ -80,8 +80,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
diff --git a/appserver/connectors/work-management/pom.xml b/appserver/connectors/work-management/pom.xml
index a446ec8..d9245cf 100644
--- a/appserver/connectors/work-management/pom.xml
+++ b/appserver/connectors/work-management/pom.xml
@@ -67,8 +67,8 @@
<dependencies>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml
index b5b5f92..57ec2a3 100755
--- a/appserver/deployment/dol/pom.xml
+++ b/appserver/deployment/dol/pom.xml
@@ -130,8 +130,8 @@
<artifactId>javax.persistence</artifactId>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 479a76f..3d66cf8 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -368,8 +368,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index dd0e175..edf3317 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -671,8 +671,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
index 3477bd3..673b84c 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/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/jakarta.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/jakarta.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/jakarta.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 6d9ba26..64cc1ff 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -570,8 +570,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/appserver/javaee-api/javax.javaee-api/pom.xml b/appserver/javaee-api/javax.javaee-api/pom.xml
index e80a813..be869ec 100644
--- a/appserver/javaee-api/javax.javaee-api/pom.xml
+++ b/appserver/javaee-api/javax.javaee-api/pom.xml
@@ -108,8 +108,8 @@
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/jaxr-ra/jaxr-ra-jar/pom.xml b/appserver/jaxr-ra/jaxr-ra-jar/pom.xml
index 7f45bf2..67931be 100644
--- a/appserver/jaxr-ra/jaxr-ra-jar/pom.xml
+++ b/appserver/jaxr-ra/jaxr-ra-jar/pom.xml
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/appserver/load-balancer/gf-load-balancer-connector/pom.xml b/appserver/load-balancer/gf-load-balancer-connector/pom.xml
index f5cc5f5..ac7f5f6 100644
--- a/appserver/load-balancer/gf-load-balancer-connector/pom.xml
+++ b/appserver/load-balancer/gf-load-balancer-connector/pom.xml
@@ -67,8 +67,8 @@
<artifactId>hk2-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.admin</groupId>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 9518e64..2cb5a31 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -54,7 +54,7 @@
<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>
- <javax.resource-api.version>1.7.1</javax.resource-api.version>
+ <jakarta.resource-api.version>1.7.2</jakarta.resource-api.version>
<javax.enterprise.deploy-api.version>1.7</javax.enterprise.deploy-api.version>
<javax.security.jacc-api.version>1.6</javax.security.jacc-api.version>
<javax.security.auth.message-api.version>1.1.1</javax.security.auth.message-api.version>
@@ -108,7 +108,6 @@
<javax.management.j2ee-api.version>1.1.2</javax.management.j2ee-api.version>
<jboss.classfilewriter.version>1.2.1.Final</jboss.classfilewriter.version>
<easymock.version>3.5</easymock.version>
- <javax.resource-api.version>1.7.1</javax.resource-api.version>
<javax.xml.registry-api.version>1.0.8</javax.xml.registry-api.version>
<maven-rar-plugin.version>2.4</maven-rar-plugin.version>
@@ -380,14 +379,14 @@
</spec>
<spec>
<artifact>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
- <version>${javax.resource-api.version}</version>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ <version>${jakarta.resource-api.version}</version>
</artifact>
<nonFinal>false</nonFinal>
<jarType>api</jarType>
- <specVersion>${javax.resource-api.version}</specVersion>
- <specImplVersion>${javax.resource-api.version}</specImplVersion>
+ <specVersion>${jakarta.resource-api.version}</specVersion>
+ <specImplVersion>${jakarta.resource-api.version}</specImplVersion>
<apiPackage>javax.resource</apiPackage>
</spec>
<spec>
@@ -550,9 +549,9 @@
<version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
- <version>${javax.resource-api.version}</version>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ <version>${jakarta.resource-api.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise.deploy</groupId>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/README.txt b/appserver/tests/appserv-tests/devtests/connector/v3/README.txt
index 019c41b..8cc9262 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/README.txt
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/README.txt
@@ -21,8 +21,8 @@
set environment :
export APS_HOME=<appserv-tests> directory
export S1AS_HOME=<GlassFish Installation> directory
-Set CLASSPATH to contain javax.resource-api.jar.
-export CLASSPATH=$S1AS_HOME/modules/javax.resource-api.jar:$CLASSPATH
+Set CLASSPATH to contain jakarta.resource-api.jar.
+export CLASSPATH=$S1AS_HOME/modules/jakarta.resource-api.jar:$CLASSPATH
Note: You need install and configure ant manually:
export ANT_HOME=<your ant home directory>
export PATH=$ANT_HOME/bin:$PATH
diff --git a/appserver/transaction/internal-api/pom.xml b/appserver/transaction/internal-api/pom.xml
index cea4b15..f91275f 100644
--- a/appserver/transaction/internal-api/pom.xml
+++ b/appserver/transaction/internal-api/pom.xml
@@ -52,8 +52,8 @@
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
diff --git a/appserver/transaction/jta/pom.xml b/appserver/transaction/jta/pom.xml
index db7c85d..bc13087 100644
--- a/appserver/transaction/jta/pom.xml
+++ b/appserver/transaction/jta/pom.xml
@@ -74,8 +74,8 @@
<artifactId>javax.interceptor-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
diff --git a/appserver/transaction/jts/pom.xml b/appserver/transaction/jts/pom.xml
index f2811dd..013be04 100644
--- a/appserver/transaction/jts/pom.xml
+++ b/appserver/transaction/jts/pom.xml
@@ -70,8 +70,8 @@
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>javax.resource-api</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main.transaction</groupId>
