AMQ-9825: ActiveMQ on Java 25

Use Java 25 compatible version of Mockito
Use Mockito Agent because self attaching an agent is now unavailable since Java 21+
Split integration tests (MRJAR dependent) into a specific integration-test phase so they use the jar in the classpath
Do not rely on activeByDefault because when other profiles activate, quick becomes inactive

Author: jeanouii

Jenkinsfile

@@ -49,7 +49,6 @@ pipeline {
         choice(name: 'nodeLabel', choices: [ 'ubuntu', 's390x', 'arm', 'Windows' ])
         choice(name: 'jdkVersion', choices: ['jdk_17_latest', 'jdk_21_latest', 'jdk_25_latest', 'jdk_17_latest_windows', 'jdk_21_latest_windows', 'jdk_25_latest_windows'])
         booleanParam(name: 'deployEnabled', defaultValue: false)
-        booleanParam(name: 'parallelTestsEnabled', defaultValue: true)
         booleanParam(name: 'sonarEnabled', defaultValue: false)
         booleanParam(name: 'testsEnabled', defaultValue: true)
     }
@@ -137,13 +136,8 @@ pipeline {
                 // all tests is very very long (10 hours on Apache Jenkins)
                 // sh 'mvn -B -e test -pl activemq-unit-tests -Dactivemq.tests=all'
                 script {
-                    if (params.parallelTestsEnabled == 'true') {
-                        sh 'echo "Running parallel-tests ..."'
-                        sh 'mvn -B -e -fae -Pparallel-tests test -Dsurefire.rerunFailingTestsCount=3'
-                    } else {
-                        sh 'echo "Running tests ..."'
-                        sh 'mvn -B -e -fae test -Dsurefire.rerunFailingTestsCount=3'
-                    }
+                    sh 'echo "Running tests ..."'
+                    sh 'mvn -B -e -fae verify -Pactivemq.tests-quick'
                 }
             }
             post {

activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java

@@ -1898,7 +1898,7 @@ public boolean isVirtualThreadTaskRunner() {
         return virtualThreadTaskRunner;
     }
 
-    @Experimental("Tech Preview for Virtaul Thread support")
+    @Experimental("Tech Preview for Virtual Thread support")
     public void setVirtualThreadTaskRunner(boolean virtualThreadTaskRunner) {
         this.virtualThreadTaskRunner = virtualThreadTaskRunner;
     }

activemq-client/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java

@@ -240,10 +240,7 @@ public void uncaughtException(final Thread t, final Throwable e) {
     }
 
     protected ExecutorService createVirtualThreadExecutor() {
-        if(!(Runtime.version().feature() >= 21)) {
-            LOG.error("Virtual Thread support requires JDK 21 or higher");
-            throw new IllegalStateException("Virtual Thread support requires JDK 21 or higher");
-        }
+        assertJDK21VirtualThreadSupport();
 
         try {
             Class<?> virtualThreadExecutorClass = Class.forName("org.apache.activemq.thread.VirtualThreadExecutor", false, threadClassLoader);
@@ -253,18 +250,15 @@ protected ExecutorService createVirtualThreadExecutor() {
                 throw new IllegalStateException("VirtualThreadExecutor not returned");
             }
             LOG.info("VirtualThreadExecutor initialized name:{}", name);
-            return ExecutorService.class.cast(result);
+            return (ExecutorService) result;
         } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | InvocationTargetException e) {
             LOG.error("VirtualThreadExecutor class failed to load", e);
             throw new IllegalStateException(e);
         }
     }
 
     protected TaskRunner createVirtualThreadTaskRunner(Executor executor, Task task, int maxIterations) {
-        if(!(Runtime.version().feature() >= 21)) {
-            LOG.error("Virtual Thread support requires JDK 21 or higher");
-            throw new IllegalStateException("Virtual Thread support requires JDK 21 or higher");
-        }
+        assertJDK21VirtualThreadSupport();
 
         try {
             Class<?> virtualThreadTaskRunnerClass = Class.forName("org.apache.activemq.thread.VirtualThreadTaskRunner", false, threadClassLoader);
@@ -273,13 +267,20 @@ protected TaskRunner createVirtualThreadTaskRunner(Executor executor, Task task,
             if(!TaskRunner.class.isAssignableFrom(result.getClass())) {
                 throw new IllegalStateException("VirtualThreadTaskRunner not returned");
             }
-            return TaskRunner.class.cast(result);
+            return (TaskRunner) result;
         } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | InvocationTargetException | InstantiationException | IllegalArgumentException e) {
             LOG.error("VirtualThreadTaskRunner class failed to load", e);
             throw new IllegalStateException(e);
         }
     }
 
+    private void assertJDK21VirtualThreadSupport() {
+        if(!(Runtime.version().feature() >= 21)) {
+            LOG.error("Virtual Thread support requires JDK 21 or higher");
+            throw new IllegalStateException("Virtual Thread support requires JDK 21 or higher");
+        }
+    }
+
 
     public ExecutorService getExecutor() {
         return executorRef.get();

activemq-unit-tests/pom.xml

@@ -465,6 +465,18 @@
             <exclude>**/ClientIdFilterDispatchPolicyTest.java</exclude>
             <exclude>**/StartAndConcurrentStopBrokerTest.java</exclude>
             <exclude>**/BlobTransferPolicyUriTest.java</exclude>
+
+            <!--
+              added when running under Java 21+, but it can't run as part of normal tests
+              because Maven Surefire will use activemq-client/target/classes instead of the MRJAR
+
+              This test needs to run as part of the integration test phase to ensure it's using the packaged version
+              We use failsafe instead which is a better choice for integration tests. See bellow the configuration.
+            -->
+            <exclude>**/VirtualThreadTaskRunnerBrokerTest.java</exclude>
+            <exclude>**/DLQRetryTest.java</exclude>
+            <exclude>**/JmxAuditLogTest.java</exclude>
+            <exclude>**/JmxCreateNCTest.java</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -507,6 +519,37 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>3.5.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <failIfNoTests>false</failIfNoTests>
+          <systemPropertyVariables>
+            <org.apache.activemq.default.directory.prefix>${project.build.directory}/</org.apache.activemq.default.directory.prefix>
+            <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+            <org.apache.activemq.AutoFailTestSupport.disableSystemExit>true</org.apache.activemq.AutoFailTestSupport.disableSystemExit>
+            <org.apache.activemq.broker.jmx.createConnector>false</org.apache.activemq.broker.jmx.createConnector>
+          </systemPropertyVariables>
+          <argLine>-Xmx512m -javaagent:${org.mockito:mockito-core:jar}</argLine>
+          <includes>
+            <include>**/VirtualThreadTaskRunnerBrokerTest.java</include>
+            <include>**/DLQRetryTest.java</include>
+            <include>**/JmxAuditLogTest.java</include>
+            <include>**/JmxCreateNCTest.java</include>
+          </includes>
+        </configuration>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -717,7 +760,6 @@
     <profile>
       <id>activemq.tests-quick</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
         <property>
           <name>activemq.tests</name>
           <value>quick</value>