Issue #23507 Fixed ejb_all tests
diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml
index f79f36e..132b0ab 100644
--- a/appserver/featuresets/glassfish/pom.xml
+++ b/appserver/featuresets/glassfish/pom.xml
@@ -804,5 +804,15 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 01ddd27..bc72d09 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -133,6 +133,7 @@
<!-- Jakarta Enterprise beans -->
<jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
+ <jakarta.ejb-management-api.version>1.1.4</jakarta.ejb-management-api.version>
<!-- Jakarta JSON -->
<jsonp-api.version>2.0.1</jsonp-api.version>
@@ -384,6 +385,11 @@
<artifactId>jakarta.ejb-api</artifactId>
<version>${jakarta.ejb-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.ejb-management-api.version}</version>
+ </dependency>
<!-- Jakarta JSON -->
<dependency>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java
index 2cd2254..0ed9298 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java
@@ -23,7 +23,7 @@
import jakarta.resource.spi.ResourceAdapterInternalException;
import jakarta.resource.spi.endpoint.MessageEndpoint;
import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.transaction.xa.XAResource;
+import javax.transaction.xa.XAResource;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
index 23448dc..9b17dfe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
@@ -49,7 +49,7 @@
try {
System.out.println("Calling getMessageContext");
- context.getMessageContext();
+ context.getEJBObject();
} catch(IllegalStateException ise) {
System.out.println("getMessageContext() successfully threw illegalStateException");
}
@@ -63,7 +63,7 @@
public void ejbTimeout(Timer timer) {
try {
System.out.println("Calling getMessageContext");
- context.getMessageContext();
+ context.getEJBObject();
} catch(IllegalStateException ise) {
System.out.println("getMessageContext() successfully threw illegalStateException");
}
