Merge remote-tracking branch 'origin/main' into release-8.7.0-alpha3

# Conflicts:
#	pom.xml

.github/workflows/build-test.yml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Build
         id: build
-        run: mvn -B -U -pl "-:zeebe-process-test-qa-testcontainers" -P !localBuild "-Dsurefire.rerunFailingTestsCount=5" clean install
+        run: mvn -B -U -pl "-:zeebe-process-test-qa-testcontainers,-:spring-boot-starter-camunda-test-testcontainer" -P !localBuild "-Dsurefire.rerunFailingTestsCount=5" clean install
 
       - name: Archive Test Results
         uses: actions/upload-artifact@v4
@@ -113,18 +113,9 @@ jobs:
           IMAGE_NAME_KEY: container.image.name
           IMAGE_TAG_KEY: container.image.tag
 
-      - name: Downgrade Java environment
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 8
-          cache: maven
-
-      # Deleting .mvn/jvm.config is a workaround for JDK8, which does not support the --add-exports options
       - name: Build
         id: build
         run: |
-          rm .mvn/jvm.config
           mvn clean -B -U -pl ":zeebe-process-test-qa-testcontainers" -P !localBuild -am "-Dsurefire.rerunFailingTestsCount=5" install -DskipChecks
 
       - name: Archive Test Results
@@ -159,51 +150,3 @@ jobs:
           name: Event File
           path: ${{ github.event_path }}
           retention-days: 1
-
-  auto-merge:
-    # This workflow will auto merge a PR authored by dependabot[bot]. It runs only on open PRs ready for
-    # review.
-    #
-    # It will merge the PR only if: it is authored by dependabot[bot], is a minor or patch semantic
-    # update, and all CI checks are successful (ignoring the soon-to-be-removed Jenkins check).
-    #
-    # The workflow is divided into multiple sequential jobs to allow giving only minimal permissions to
-    # the GitHub token passed around.
-    #
-    # Once we're using the merge queue feature, I think we can simplify this workflow a lot by relying
-    # on dependabot merging PRs via its commands, as it will always wait for checks to be green before
-    # merging.
-    name: Auto-merge dependabot, camundait, and backport PRs
-    runs-on: ubuntu-latest
-    needs: [ test-summary ]
-    if: github.repository == 'camunda/zeebe-process-test' && (github.actor == 'dependabot[bot]' || github.actor == 'camundait' || github.actor == 'backport-action')
-    permissions:
-      checks: read
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v4
-      - id: metadata
-        if: github.actor == 'dependabot[bot]'
-        name: Fetch dependency metadata
-        uses: dependabot/[email protected]
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - id: approve-and-merge-dependabot
-        name: Approve and merge dependabot PR
-        if: github.actor == 'dependabot[bot]' && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor')
-        run: >
-          gh pr review --approve "$PR_URL"
-          gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      - id: approve-and-merge-backport
-        name: Approve and merge backport PR
-        if: github.actor != 'dependabot[bot]'
-        run: >
-          gh pr review --approve "$PR_URL"
-          gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-

engine-agent/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:21.0.5_11-jdk-jammy
 
 COPY target/*-jar-with-dependencies.jar /zeebe-process-test-engine.jar
 

engine-agent/pom.xml

@@ -131,7 +131,7 @@
           <plugin>
             <groupId>com.google.cloud.tools</groupId>
             <artifactId>jib-maven-plugin</artifactId>
-            <version>3.4.2</version>
+            <version>3.4.4</version>
             <configuration>
               <from>
                 <image>eclipse-temurin:21-jdk-jammy</image>

extension-testcontainer/pom.xml

@@ -77,11 +77,6 @@
       <artifactId>zeebe-process-test-filters</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-commons</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>

extension-testcontainer/src/main/java/io.camunda.zeebe.process.test.extension.testcontainer/ZeebeProcessTestExtension.java → extension-testcontainer/src/main/java/io/camunda/zeebe/process/test/extension/testcontainer/ZeebeProcessTestExtension.java

@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestWatcher;
-import org.junit.platform.commons.util.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -148,7 +147,7 @@ private Optional<Field> getField(final Class<?> requiredTestClass, final Class<?
                   + "found %s. Please make sure at most one field of type %s has been declared in the"
                   + " test class.",
               clazz.getSimpleName(), fields.size(), clazz.getSimpleName()));
-    } else if (fields.size() == 0) {
+    } else if (fields.isEmpty()) {
       final Class<?> superclass = requiredTestClass.getSuperclass();
       return superclass == null ? Optional.empty() : getField(superclass, clazz);
     } else {
@@ -159,7 +158,7 @@ private Optional<Field> getField(final Class<?> requiredTestClass, final Class<?
   private void injectField(
       final ExtensionContext extensionContext, final Field field, final Object object) {
     try {
-      ReflectionUtils.makeAccessible(field);
+      field.setAccessible(true);
       field.set(extensionContext.getRequiredTestInstance(), object);
     } catch (final IllegalAccessException e) {
       throw new RuntimeException(e);
@@ -190,7 +189,7 @@ private ObjectMapper getObjectMapper(final ExtensionContext context) {
     }
 
     final Field customMapper = customMapperOpt.get();
-    ReflectionUtils.makeAccessible(customMapper);
+    customMapper.setAccessible(true);
     try {
       return (ObjectMapper) customMapper.get(context.getRequiredTestInstance());
     } catch (final IllegalAccessException e) {

extension/src/main/java/io/camunda/zeebe/process/test/extension/ZeebeProcessTestExtension.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestWatcher;
-import org.junit.platform.commons.util.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -123,18 +122,18 @@ private Optional<Field> getField(final Class<?> requiredTestClass, final Class<?
                   + "found %s. Please make sure at most one field of type %s has been declared in the"
                   + " test class.",
               clazz.getSimpleName(), fields.size(), clazz.getSimpleName()));
-    } else if (fields.size() == 0) {
+    } else if (fields.isEmpty()) {
       final Class<?> superclass = requiredTestClass.getSuperclass();
       return superclass == null ? Optional.empty() : getField(superclass, clazz);
     } else {
-      return Optional.of(fields.get(0));
+      return Optional.of(fields.getFirst());
     }
   }
 
   private void injectField(
       final ExtensionContext extensionContext, final Field field, final Object object) {
     try {
-      ReflectionUtils.makeAccessible(field);
+      field.setAccessible(true);
       field.set(extensionContext.getRequiredTestInstance(), object);
     } catch (final IllegalAccessException e) {
       throw new RuntimeException(e);
@@ -159,7 +158,7 @@ private ObjectMapper getObjectMapper(final ExtensionContext context) {
     }
 
     final var customMapper = customMapperOpt.get();
-    ReflectionUtils.makeAccessible(customMapper);
+    customMapper.setAccessible(true);
     try {
       return (ObjectMapper) customMapper.get(context.getRequiredTestInstance());
     } catch (final IllegalAccessException e) {

pom.xml

@@ -51,6 +51,7 @@
     <module>filters</module>
     <module>qa</module>
     <module>examples</module>
+    <module>spring-test</module>
   </modules>
 
   <scm>
@@ -61,61 +62,61 @@
   </scm>
 
   <properties>
-    <dependency.agrona.version>1.21.1</dependency.agrona.version>
-    <dependency.assertj.version>3.25.3</dependency.assertj.version>
-    <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
-    <dependency.bytebuddy.version>1.14.16</dependency.bytebuddy.version>
+    <dependency.agrona.version>1.23.1</dependency.agrona.version>
+    <dependency.assertj.version>3.27.2</dependency.assertj.version>
+    <dependency.awaitility.version>4.2.2</dependency.awaitility.version>
+    <dependency.bytebuddy.version>1.15.11</dependency.bytebuddy.version>
     <dependency.camundamodel.version>7.19.0</dependency.camundamodel.version>
-    <dependency.classgraph.version>4.8.174</dependency.classgraph.version>
-    <dependency.commons.version>3.14.0</dependency.commons.version>
-    <dependency.errorprone.version>2.29.0</dependency.errorprone.version>
-    <dependency.feel.version>1.17.7</dependency.feel.version>
+    <dependency.classgraph.version>4.8.179</dependency.classgraph.version>
+    <dependency.commons.version>3.17.0</dependency.commons.version>
+    <dependency.errorprone.version>2.36.0</dependency.errorprone.version>
+    <dependency.feel.version>1.19.0</dependency.feel.version>
     <dependency.findbugs.version>3.0.2</dependency.findbugs.version>
-    <dependency.guava.version>33.2.0-jre</dependency.guava.version>
-    <dependency.httpcore5.version>5.2.5</dependency.httpcore5.version>
+    <dependency.guava.version>33.4.0-jre</dependency.guava.version>
+    <dependency.httpcore5.version>5.3.1</dependency.httpcore5.version>
     <dependency.immutables.version>2.10.1</dependency.immutables.version>
-    <dependency.jackson.version>2.17.0</dependency.jackson.version>
+    <dependency.jackson.version>2.18.2</dependency.jackson.version>
     <dependency.javax.version>1.3.2</dependency.javax.version>
-    <dependency.jna.version>5.14.0</dependency.jna.version>
-    <dependency.junit.version>5.11.3</dependency.junit.version>
+    <dependency.jna.version>5.16.0</dependency.jna.version>
+    <dependency.junit.version>5.11.4</dependency.junit.version>
     <dependency.junit4.version>4.13.2</dependency.junit4.version>
-    <dependency.micrometer.version>1.13.3</dependency.micrometer.version>
-    <dependency.mockito.version>4.11.0</dependency.mockito.version>
+    <dependency.micrometer.version>1.14.2</dependency.micrometer.version>
+    <dependency.mockito.version>5.15.2</dependency.mockito.version>
     <dependency.netty.version>4.1.116.Final</dependency.netty.version>
     <dependency.osgi.version>6.0.0</dependency.osgi.version>
     <dependency.proto.version>2.50.0</dependency.proto.version>
     <dependency.protobuf.version>4.29.2</dependency.protobuf.version>
     <dependency.revapi.version>0.28.1</dependency.revapi.version>
-    <dependency.scala.version>2.13.14</dependency.scala.version>
-    <dependency.slf4j.version>2.0.13</dependency.slf4j.version>
-    <dependency.snakeyaml.version>2.2</dependency.snakeyaml.version>
-    <dependency.spring.version>6.1.8</dependency.spring.version>
-    <dependency.testcontainers.version>1.19.8</dependency.testcontainers.version>
+    <dependency.scala.version>2.13.15</dependency.scala.version>
+    <dependency.slf4j.version>2.0.16</dependency.slf4j.version>
+    <dependency.snakeyaml.version>2.3</dependency.snakeyaml.version>
+    <dependency.spring.version>6.1.14</dependency.spring.version>
+    <dependency.testcontainers.version>1.20.4</dependency.testcontainers.version>
     <dependency.zeebe.version>8.7.0-alpha3</dependency.zeebe.version>
 
     <license.header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</license.header>
 
     <nexus.release.repository>https://artifacts.camunda.com/artifactory/zeebe-io/</nexus.release.repository>
     <nexus.release.repository.id>camunda-nexus</nexus.release.repository.id>
     <nexus.snapshot.repository>https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/</nexus.snapshot.repository>
-    <nexus.snapshot.repository.id>camunda-nexus-snapshots</nexus.snapshot.repository.id>
+    <nexus.snapshot.repository.id>camunda-nexus</nexus.snapshot.repository.id>
 
-    <plugin.version.dependency>3.6.1</plugin.version.dependency>
+    <plugin.version.dependency>3.8.1</plugin.version.dependency>
     <plugin.version.flatten>1.6.0</plugin.version.flatten>
     <plugin.version.fmt>2.9.1</plugin.version.fmt>
 
     <!-- when updating this version, also change it in .idea/externalDependencies.xml -->
-    <plugin.version.googlejavaformat>1.22.0</plugin.version.googlejavaformat>
+    <plugin.version.googlejavaformat>1.25.2</plugin.version.googlejavaformat>
 
     <plugin.version.jacoco>0.8.12</plugin.version.jacoco>
-    <plugin.version.javadoc>3.6.3</plugin.version.javadoc>
-    <plugin.version.license>4.5</plugin.version.license>
-    <plugin.version.maven-enforcer>3.4.1</plugin.version.maven-enforcer>
-    <plugin.version.maven-help>3.4.0</plugin.version.maven-help>
+    <plugin.version.javadoc>3.11.2</plugin.version.javadoc>
+    <plugin.version.license>4.6</plugin.version.license>
+    <plugin.version.maven-enforcer>3.5.0</plugin.version.maven-enforcer>
+    <plugin.version.maven-help>3.5.1</plugin.version.maven-help>
     <plugin.version.os-maven>1.7.1</plugin.version.os-maven>
     <plugin.version.revapi>0.15.0</plugin.version.revapi>
-    <plugin.version.spotless>2.30.0</plugin.version.spotless>
-    <plugin.version.surefire>3.2.5</plugin.version.surefire>
+    <plugin.version.spotless>2.44.1</plugin.version.spotless>
+    <plugin.version.surefire>3.5.2</plugin.version.surefire>
 
     <skipChecks>false</skipChecks>
 
@@ -169,6 +170,12 @@
         <version>8.7.0-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.camunda</groupId>
+        <artifactId>spring-boot-starter-camunda-test-common</artifactId>
+        <version>8.7.0-SNAPSHOT</version>
+      </dependency>
+
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -191,6 +198,12 @@
         <scope>import</scope>
       </dependency>
 
+      <dependency>
+        <groupId>io.camunda</groupId>
+        <artifactId>spring-boot-starter-camunda-sdk</artifactId>
+        <version>${dependency.zeebe.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.camunda</groupId>
         <artifactId>camunda-client-java</artifactId>
@@ -427,6 +440,11 @@
         <artifactId>httpcore5</artifactId>
         <version>${dependency.httpcore5.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jetbrains</groupId>
+        <artifactId>annotations</artifactId>
+        <version>26.0.1</version>
+      </dependency>
       <!-- This should be able to be removed after 1.4.0-alpha2 -->
       <dependency>
         <groupId>org.camunda.feel</groupId>
@@ -475,6 +493,13 @@
         <artifactId>spring-core</artifactId>
         <version>${dependency.spring.version}</version>
       </dependency>
+
+      <!-- fix dependency convergence between guava and spring-boot-starter-camunda-test-common -->
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-qual</artifactId>
+        <version>3.48.4</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -486,7 +511,7 @@
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
-      <id>${nexus.release.repository.id}</id>
+      <id>${nexus.release.repository.id}-release</id>
       <url>${nexus.release.repository}</url>
     </repository>
     <repository>