spring 3.x will hopefully work

camunda-community-hub · Nov 29, 2023 · eb3219e · eb3219e
1 parent 83cd3a8
commit eb3219e
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <camunda.version>7.17.0</camunda.version>
-    <version.java>11</version.java>
+    <camunda.version>7.20.0-alpha3</camunda.version>
+    <version.java>17</version.java>
   </properties>
 
   <build>

diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>io.vanillabp</groupId>
       <artifactId>spring-boot-support</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>
@@ -35,12 +35,12 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <scope>provided</scope>
-      <version>4.0.4</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jakarta.servlet</groupId>-->
+<!--      <artifactId>jakarta.servlet-api</artifactId>-->
+<!--      <scope>provided</scope>-->
+<!--      <version>4.0.4</version>-->
+<!--    </dependency>-->
   </dependencies>
 
   <licenses>

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda7/Camunda7AdapterConfiguration.java b/spring-boot/src/main/java/io/vanillabp/camunda7/Camunda7AdapterConfiguration.java
@@ -29,7 +29,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.repository.CrudRepository;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.math.BigInteger;
 import java.util.function.Function;
 

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda7/cockpit/WakeupFilter.java b/spring-boot/src/main/java/io/vanillabp/camunda7/cockpit/WakeupFilter.java
@@ -1,20 +1,19 @@
 package io.vanillabp.camunda7.cockpit;
 
+import java.io.IOException;
+import java.util.Date;
+
 import io.vanillabp.camunda7.service.WakupJobExecutorNotification;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.TaskScheduler;
 
-import java.io.IOException;
-import java.util.Date;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
 public class WakeupFilter implements Filter {
 
     private static final Logger logger = LoggerFactory.getLogger(WakeupFilter.class);

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda7/deployment/Camunda7DeploymentAdapter.java b/spring-boot/src/main/java/io/vanillabp/camunda7/deployment/Camunda7DeploymentAdapter.java
@@ -1,10 +1,12 @@
 package io.vanillabp.camunda7.deployment;
 
+
 import io.vanillabp.camunda7.Camunda7AdapterConfiguration;
 import io.vanillabp.camunda7.wiring.Camunda7TaskWiring;
 import io.vanillabp.camunda7.wiring.TaskWiringBpmnParseListener;
 import io.vanillabp.springboot.adapter.ModuleAwareBpmnDeployment;
 import io.vanillabp.springboot.adapter.VanillaBpProperties;
+import jakarta.annotation.PostConstruct;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.repository.ResumePreviousBy;
 import org.camunda.bpm.engine.spring.application.SpringProcessApplication;
@@ -13,7 +15,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.PostConstruct;
 
 @Transactional
 public class Camunda7DeploymentAdapter extends ModuleAwareBpmnDeployment {

diff --git a/...ain/java/io/vanillabp/camunda7/deployment/Camunda7DisableAutoDeploymentConfiguration.java b/...ain/java/io/vanillabp/camunda7/deployment/Camunda7DisableAutoDeploymentConfiguration.java
@@ -6,7 +6,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Configuration
 @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)

diff --git a/...-boot/src/main/java/io/vanillabp/camunda7/wiring/ProcessEntityAwareExpressionManager.java b/...-boot/src/main/java/io/vanillabp/camunda7/wiring/ProcessEntityAwareExpressionManager.java
@@ -1,9 +1,9 @@
 package io.vanillabp.camunda7.wiring;
 
 import io.vanillabp.camunda7.service.Camunda7ProcessService;
-import org.camunda.bpm.engine.impl.javax.el.CompositeELResolver;
-import org.camunda.bpm.engine.impl.javax.el.ELResolver;
 import org.camunda.bpm.engine.spring.SpringExpressionManager;
+import org.camunda.bpm.impl.juel.jakarta.el.CompositeELResolver;
+import org.camunda.bpm.impl.juel.jakarta.el.ELResolver;
 import org.springframework.context.ApplicationContext;
 
 import java.util.Collection;

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda7/wiring/ProcessEntityELResolver.java b/spring-boot/src/main/java/io/vanillabp/camunda7/wiring/ProcessEntityELResolver.java
@@ -8,9 +8,9 @@
 import java.util.function.Supplier;
 
 import org.camunda.bpm.engine.ProcessEngineException;
-import org.camunda.bpm.engine.impl.javax.el.ELContext;
-import org.camunda.bpm.engine.impl.javax.el.ELResolver;
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity;
+import org.camunda.bpm.impl.juel.jakarta.el.ELContext;
+import org.camunda.bpm.impl.juel.jakarta.el.ELResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda7/wiring/TaskWiringBpmnParseListener.java b/spring-boot/src/main/java/io/vanillabp/camunda7/wiring/TaskWiringBpmnParseListener.java
@@ -7,6 +7,7 @@
 import org.camunda.bpm.engine.impl.bpmn.listener.ExpressionExecutionListener;
 import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParse;
 import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParseListener;
+import org.camunda.bpm.engine.impl.core.variable.mapping.IoMapping;
 import org.camunda.bpm.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.camunda.bpm.engine.impl.pvm.process.ActivityImpl;
 import org.camunda.bpm.engine.impl.pvm.process.ScopeImpl;
@@ -793,5 +794,10 @@ public void parseConditionalStartEventForEventSubprocess(
         removeAsyncBeforeAndAsyncAfter(element, activity);
 
     }
-
+
+    @Override
+    public void parseIoMapping(final Element element, final ActivityImpl activity, final IoMapping ioMapping) {
+        // TODO document why this method is empty
+    }
+
 }
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+io.vanillabp.camunda7.deployment.Camunda7DisableAutoDeploymentConfiguration
+io.vanillabp.camunda7.jobexecutor.WakeupJobExecutorConfiguration
+io.vanillabp.camunda7.Camunda7AdapterConfiguration