chore(release): adjust BPMN 2.0 examples

Related to camunda/camunda-bpm-platform#4255
camunda · Oct 1, 2024 · 7d14b5b · 7d14b5b
1 parent 27a225d
commit 7d14b5b
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 28 deletions.
diff --git a/scripttask/xslt-scripttask/pom.xml b/scripttask/xslt-scripttask/pom.xml
@@ -11,11 +11,11 @@
 
   <properties>
     <camunda.version>7.22.0</camunda.version>
-    <groovy.version>2.4.21</groovy.version>
+    <groovy.version>4.0.22</groovy.version>
     <slf4j.version>1.7.36</slf4j.version>
     <junit.version>4.13.2</junit.version>
     <assertj.version>3.21.0</assertj.version>
-    <h2.version>2.1.214</h2.version>
+    <h2.version>2.3.232</h2.version>
     <version.template-engine-xslt>2.2.0</version.template-engine-xslt>
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>
@@ -55,9 +55,10 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-all</artifactId>
       <version>${groovy.version}</version>
+      <type>pom</type>
     </dependency>
 
     <!-- redirect slf4j logging to jdk logging -->

diff --git a/servicetask/rest-service/pom.xml b/servicetask/rest-service/pom.xml
@@ -13,7 +13,7 @@
     <version.camunda>7.22.0</version.camunda>
     <version.graal.js>21.1.0</version.graal.js>
     <version.junit>4.13.1</version.junit>
-    <version.h2>2.1.214</version.h2>
+    <version.h2>2.3.232</version.h2>
     <version.slf4j>1.7.36</version.slf4j>
     <maven.compiler.release>11</maven.compiler.release>
 	  <maven.compiler.version>3.11.0</maven.compiler.version>

diff --git a/servicetask/service-invocation-asynchronous/pom.xml b/servicetask/service-invocation-asynchronous/pom.xml
@@ -11,7 +11,7 @@
     <version.camunda>7.22.0</version.camunda>
     <version.slf4j>1.7.36</version.slf4j>
     <version.junit>4.13.2</version.junit>
-    <version.h2>2.1.214</version.h2>
+    <version.h2>2.3.232</version.h2>
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/servicetask/service-invocation-synchronous/pom.xml b/servicetask/service-invocation-synchronous/pom.xml
@@ -10,7 +10,7 @@
   <properties>
     <version.camunda>7.22.0</version.camunda>
     <version.junit>4.13.2</version.junit>
-    <version.h2>2.1.214</version.h2>
+    <version.h2>2.3.232</version.h2>
     <version.slf4j>1.7.36</version.slf4j>
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>       

diff --git a/startevent/message-start/pom.xml b/startevent/message-start/pom.xml
@@ -12,7 +12,7 @@
   <properties>
     <version.camunda>7.22.0</version.camunda>
     <version.junit>4.13.2</version.junit>
-    <version.h2>2.1.214</version.h2>
+    <version.h2>2.3.232</version.h2>
     <version.slf4j>1.7.36</version.slf4j>
 
     <maven.compiler.release>11</maven.compiler.release>

diff --git a/usertask/task-camunda-forms/pom.xml b/usertask/task-camunda-forms/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <version.camunda>7.22.0</version.camunda>
-    <version.jakarta-servlet-api>4.0.4</version.jakarta-servlet-api>
+    <version.jakarta-servlet-api>6.0.0</version.jakarta-servlet-api>
 
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>

diff --git a/...ickstart/camunda-forms/CamundaFormPa.java → .../usertask/camundaforms/CamundaFormPa.java b/...ickstart/camunda-forms/CamundaFormPa.java → .../usertask/camundaforms/CamundaFormPa.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.camunda.bpm.quickstart.usertask.forms;
+package org.camunda.bpm.usertask.camundaforms;
 
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextListener;
 
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 /**
  * <p>This class transforms your regular java web application
@@ -42,6 +42,6 @@
  * deployment descriptor.</p>
  */
 @ProcessApplication
-public class CamundaFormPa extends ServletProcessApplication {
+public class CamundaFormPa extends JakartaServletProcessApplication {
 
 }
diff --git a/usertask/task-form-embedded-bpmn-events/pom.xml b/usertask/task-form-embedded-bpmn-events/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <version.camunda>7.22.0</version.camunda>
-    <version.jakarta-servlet-api>4.0.4</version.jakarta-servlet-api>
+    <version.jakarta-servlet-api>6.0.0</version.jakarta-servlet-api>
 
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>

diff --git a/...ded-bpmn-events/src/main/java/org/camunda/bpm/quickstart/usertask/EmbeddedTaskFormPa.java b/...ded-bpmn-events/src/main/java/org/camunda/bpm/quickstart/usertask/EmbeddedTaskFormPa.java
@@ -16,10 +16,10 @@
  */
 package org.camunda.bpm.quickstart.usertask;
 
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextListener;
 
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 /**
  * <p>This class transforms your regular java web application
@@ -42,6 +42,6 @@
  * deployment descriptor.</p>
  */
 @ProcessApplication
-public class EmbeddedTaskFormPa extends ServletProcessApplication {
+public class EmbeddedTaskFormPa extends JakartaServletProcessApplication {
 
 }
diff --git a/usertask/task-form-embedded-json-variables/pom.xml b/usertask/task-form-embedded-json-variables/pom.xml
@@ -8,7 +8,7 @@
 
   <properties>
     <camunda.version>7.22.0</camunda.version>
-    <version.jakarta-servlet-api>4.0.4</version.jakarta-servlet-api>
+    <version.jakarta-servlet-api>6.0.0</version.jakarta-servlet-api>
 
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>

diff --git a/...embedded-json-variables/src/main/java/org/camunda/bpm/example/JsonProcessApplication.java b/...embedded-json-variables/src/main/java/org/camunda/bpm/example/JsonProcessApplication.java
@@ -16,10 +16,12 @@
  */
 package org.camunda.bpm.example;
 
+import jakarta.servlet.ServletContextListener;
+
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 @ProcessApplication
-public class JsonProcessApplication extends ServletProcessApplication {
+public class JsonProcessApplication extends JakartaServletProcessApplication {
 
 }
diff --git a/usertask/task-form-embedded-react/pom.xml b/usertask/task-form-embedded-react/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <version.camunda>7.22.0</version.camunda>
-    <version.jakarta-servlet-api>4.0.4</version.jakarta-servlet-api>
+    <version.jakarta-servlet-api>6.0.0</version.jakarta-servlet-api>
 
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.version>3.11.0</maven.compiler.version>

diff --git a/...mbedded-react/src/main/java/org/camunda/bpm/quickstart/react/EmbeddedTaskFormReactPa.java b/...mbedded-react/src/main/java/org/camunda/bpm/quickstart/react/EmbeddedTaskFormReactPa.java
@@ -16,10 +16,10 @@
  */
 package org.camunda.bpm.quickstart.react;
 
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextListener;
 
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 /**
  * <p>This class transforms your regular java web application
@@ -42,6 +42,6 @@
  * deployment descriptor.</p>
  */
 @ProcessApplication
-public class EmbeddedTaskFormReactPa extends ServletProcessApplication {
+public class EmbeddedTaskFormReactPa extends JakartaServletProcessApplication {
 
 }
diff --git a/usertask/task-form-embedded/pom.xml b/usertask/task-form-embedded/pom.xml
@@ -9,7 +9,8 @@
 
   <properties>
     <version.camunda>7.22.0</version.camunda>
-    <version.jakarta-servlet-api>4.0.4</version.jakarta-servlet-api>
+    <version.jakarta-servlet-api>6.0.0</version.jakarta-servlet-api>
+
     <maven.compiler.release>11</maven.compiler.release>
     <maven.war-plugin.version>3.3.2</maven.war-plugin.version>
     <maven.compiler.version>3.11.0</maven.compiler.version>

diff --git a/...k-form-embedded/src/main/java/org/camunda/bpm/quickstart/usertask/EmbeddedTaskFormPa.java b/...k-form-embedded/src/main/java/org/camunda/bpm/quickstart/usertask/EmbeddedTaskFormPa.java
@@ -16,10 +16,10 @@
  */
 package org.camunda.bpm.quickstart.usertask;
 
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextListener;
 
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 /**
  * <p>This class transforms your regular java web application
@@ -42,6 +42,6 @@
  * deployment descriptor.</p>
  */
 @ProcessApplication
-public class EmbeddedTaskFormPa extends ServletProcessApplication {
+public class EmbeddedTaskFormPa extends JakartaServletProcessApplication {
 
 }
diff --git a/wildfly/jackson-annotations/README.md b/wildfly/jackson-annotations/README.md
@@ -14,7 +14,7 @@ and json serialization.
 
 1. Checkout the git repository
 2. Build the project with maven
-3. Deploy the created war on Camunda WildFly 31 distribution
+3. Deploy the created war on latest Camunda WildFly distribution
 4. Open Cockpit and take a look into the process 'waitingProcess'
 5. Look at the variable called `variable`, only the properties `property1` and `property3` are shown.