feat(engine-spring): introduce Spring 6 support for engine-spring

* engine-spring: * tests: replace deprecated Spring 5 code * SpringProcessApplicationElResolver: Using fully-qualified class name instead of import statement to allow for automatic transformation * engine-spring-6: add new engine-spring module for Spring 6 support using code transformation * distro/wildfly: Spring 6 dependency for WildFly 27 * qa: use Spring 6 for wildfly engine integration jakarta setup * ci: use JDK 17 for wildfly engine integration jakarta stages Related to camunda#3439 --------- Co-authored-by: Tobias Metzke-Bernstein <tobias.metzke@camunda.com>
vivekchand · Jun 14, 2023 · 37e32a8 · 37e32a8
1 parent fad231a
commit 37e32a8
Show file tree

Hide file tree

Showing 13 changed files with 539 additions and 35 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -227,8 +227,8 @@ pipeline {
                   'clean install -Pwildfly,postgresql,engine-integration-jakarta', 
                   runtimeStash: true, 
                   archiveStash: true,
-                  // we need to use JDK 11 for WildFly 27+
-                  jdkVersion: 'jdk-11-latest')
+                  // we need to use JDK 17 for WildFly 27+ + Spring 6
+                  jdkVersion: 'jdk-17-latest')
               },
               postFailure: {
                 cambpmPublishTestResult()
@@ -515,8 +515,8 @@ pipeline {
                   'clean install -Pwildfly-domain,h2,engine-integration-jakarta',
                   runtimeStash: true,
                   archiveStash: true,
-                  // we need to use JDK 11 for WildFly 27+
-                  jdkVersion: 'jdk-11-latest')
+                  // we need to use JDK 17 for WildFly 27+ + Spring 6
+                  jdkVersion: 'jdk-17 -latest')
               },
               postFailure: {
                 cambpmPublishTestResult()
@@ -538,8 +538,8 @@ pipeline {
                   'clean install -Pwildfly,wildfly-servlet,h2,engine-integration-jakarta',
                   runtimeStash: true,
                   archiveStash: true,
-                  // we need to use JDK 11 for WildFly 27+
-                  jdkVersion: 'jdk-11-latest')
+                  // we need to use JDK 17 for WildFly 27+ + Spring 6
+                  jdkVersion: 'jdk-17-latest')
               },
               postFailure: {
                 cambpmPublishTestResult()

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -68,6 +68,11 @@
         <artifactId>camunda-engine-spring</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.camunda.bpm</groupId>
+        <artifactId>camunda-engine-spring-6</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.camunda.bpm</groupId>
         <artifactId>camunda-engine-rest</artifactId>

diff --git a/distro/wildfly/assembly/pom.xml b/distro/wildfly/assembly/pom.xml
@@ -54,7 +54,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-spring</artifactId>
+      <artifactId>camunda-engine-spring-6</artifactId>
     </dependency>
 
     <dependency>