chore(.ci/config): Add JDK 21 Build Support

.ci/config/matrices.yaml

@@ -56,7 +56,9 @@ sidetrack-stages:
   - 'rolling-update'
 jdk-ce-stages:
   stages:
+  - 'platform-jdk-openjdk-jdk-21-latest'
   - 'platform-jdk-openjdk-jdk-17-latest'
   - 'platform-jdk-openjdk-jdk-11-latest'
+  - 'platform-jdk-jdk-21-latest'
   - 'platform-jdk-jdk-17-latest'
   - 'platform-jdk-jdk-11-latest'

.ci/config/stage-types.yaml

@@ -141,6 +141,14 @@ platform-jdk-openjdk-jdk-17-latest:
   nodeLabel: 'h2'
   jdkVersion: 'openjdk-jdk-17-latest'
   withNpm: true
+platform-jdk-openjdk-jdk-21-latest:
+  directory: '.'
+  command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly'
+  stash:
+    runtimeStash: true
+  nodeLabel: 'h2'
+  jdkVersion: 'openjdk-jdk-21-latest'
+  withNpm: true
 platform-jdk-openjdk-jdk-11-latest:
   directory: '.'
   command: 'install source:jar source:test-jar
@@ -170,6 +178,14 @@ platform-jdk-jdk-17-latest:
   nodeLabel: 'h2'
   jdkVersion: 'jdk-17-latest'
   withNpm: true
+platform-jdk-jdk-21-latest:
+  directory: '.'
+  command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly'
+  stash:
+    runtimeStash: true
+  nodeLabel: 'h2'
+  jdkVersion: 'jdk-21-latest'
+  withNpm: true
 platform-jdk-jdk-11-latest:
   directory: '.'
   command: 'install source:jar source:test-jar

clients/java/client/pom.xml

@@ -161,11 +161,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 

engine/pom.xml

@@ -201,7 +201,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
 

engine/src/main/java/org/camunda/bpm/engine/impl/interceptor/CommandCounterInterceptor.java

@@ -30,15 +30,14 @@ public CommandCounterInterceptor(ProcessEngineConfigurationImpl processEngineCon
 
   @Override
   public <T> T execute(Command<T> command) {
-
     try {
       return next.execute(command);
     } finally {
       TelemetryRegistry telemetryRegistry = processEngineConfiguration.getTelemetryRegistry();
       if (telemetryRegistry != null) {
         String className = ClassNameUtil.getClassNameWithoutPackage(command);
         // anonymous class/lambda implementations of the Command interface are excluded
-        if (!command.getClass().isAnonymousClass() && !className.contains("$$Lambda$")) {
+        if (!command.getClass().isAnonymousClass() && !className.contains("$$Lambda")) {
           className = parseLocalClassName(className);
           telemetryRegistry.markOccurrence(className);
         }

internal-dependencies/pom.xml

@@ -199,12 +199,6 @@
         <version>${version.mockito}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>${version.mockito}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>

parent/pom.xml

@@ -43,7 +43,7 @@
     <version.logback>1.2.11</version.logback>
     <version.junit>4.13.1</version.junit>
     <version.assertj>2.9.1</version.assertj>
-    <version.mockito>4.3.1</version.mockito>
+    <version.mockito>5.10.0</version.mockito>
     <version.wiremock>2.27.2</version.wiremock>
     <version.wiremock-jre8>2.27.2</version.wiremock-jre8>
     <version.testcontainers>1.16.0</version.testcontainers>

spring-boot-starter/starter-client/spring-boot/pom.xml

@@ -55,7 +55,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
       <version>${version.mockito}</version>
     </dependency>

spring-boot-starter/starter-client/spring/pom.xml

@@ -63,7 +63,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
       <version>${version.mockito}</version>
     </dependency>

spring-boot-starter/starter-webapp-core/pom.xml

@@ -61,7 +61,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
       <version>${version.mockito}</version>
     </dependency>

test-utils/assert/core/pom.xml

@@ -50,12 +50,6 @@
       <version>${version.mockito}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${version.mockito}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

webapps/pom.xml

@@ -111,12 +111,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>