feat(release): adjust examples for 7.20.0 release (#263)

* Adjust examples to `7.20.0` and JDK 11 * Bump dependencies * Adjust Quarkus examples to Quarkus 3 related to camunda/camunda-bpm-platform#3342 --------- Co-authored-by: psavidis <69160690+psavidis@users.noreply.github.com> Co-authored-by: Daniel Kelemen <danielkelemen@users.noreply.github.com> Co-authored-by: yanavasileva <yanavasileva@users.noreply.github.com> Co-authored-by: Tassilo Weidner <3015690+tasso94@users.noreply.github.com> Co-authored-by: Miklas Boskamp <20189772+mboskamp@users.noreply.github.com>
camunda · Oct 4, 2023 · 2a81e22 · 2a81e22
1 parent b425f24
commit 2a81e22
Show file tree

Hide file tree

Showing 101 changed files with 4,150 additions and 3,569 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ Camunda Platform examples is a collection of focused usage examples for the [Cam
 | Camunda Version | Link                                                                  | Checkout command      |
 |-----------------|-----------------------------------------------------------------------|-----------------------|
 | Latest          | [Master branch](https://github.com/camunda/camunda-bpm-examples)      | `git checkout master` |
+| 7.20            | [7.20 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.20) | `git checkout 7.20`   |
 | 7.19            | [7.19 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.19) | `git checkout 7.19`   |
 | 7.18            | [7.18 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.18) | `git checkout 7.18`   |
 | 7.17            | [7.17 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.17) | `git checkout 7.17`   |
@@ -80,22 +81,22 @@ If you clone this repository, use the checkout commands to access the sources fo
 | [User Task Form Generated](/usertask/task-form-generated) [^1][^2]                                               | All               | Html, Form, Usertask      |
 | [User Task Form JSF](/usertask/task-form-external-jsf) [^1][^2]                                                  | JavaEE Containers | JSF, Form, Usertask       |
 | [Script Task XSLT](/scripttask/xslt-scripttask)                                                                  | Unit Test         | XSLT Scripttask           |
-| [Script Task XQuery](/scripttask/xquery-scripttask)                                                              | Unit Test         | XQuery Scripttask         |
+| [Script Task XQuery](/scripttask/xquery-scripttask) [^1]                                                         | Unit Test         | XQuery Scripttask         |
 | [Start Event - Message](/startevent/message-start)                                                               | Unit Test         | Message Start Event       |
-| [Start Process - SOAP CXF](/startevent/soap-cxf-server-start)                                                    | War               | SOAP, CXF, Spring         |
+| [Start Process - SOAP CXF](/startevent/soap-cxf-server-start) [^1]                                               | War               | SOAP, CXF, Spring         |
 
 ### Deployment & Project Setup Examples
 
-| Name                                                                                          | Container             |  Keywords                 |
-|-----------------------------------------------------------------------------------------------|-----------------------|---------------------------|
-| [Process Application - Servlet](deployment/servlet-pa)                                        | All                   | War, Servlet              |
-| [Process Application - EJB](deployment/ejb-pa)                                                | JavaEE Containers     | Ejb, War                  |
-| [Process Application - Jakarta EJB](deployment/ejb-pa-jakarta)                                | Jakarta EE Containers | Ejb, War                  |
-| [Process Application - Spring Servlet - WildFly](deployment/spring-servlet-pa-wildfly)        | WildFly               | Spring, Servlet, War      |
-| [Process Application - Spring Servlet - Embedded Tomcat](deployment/spring-servlet-pa-tomcat) | Tomcat                | Spring, Servlet, War      |
-| [Embedded Spring with embedded REST](deployment/embedded-spring-rest)                         | vanilla Apache Tomcat | Spring, Rest, Embedded    |
-| [Plain Spring Web application - WildFly](deployment/spring-wildfly-non-pa)                    | WildFly               | Spring, Jndi, War         |
-| [Process Application - Spring Boot](deployment/spring-boot) [^1]                              | Spring Boot           | Spring                    |
+| Name                                                                                            | Container             |  Keywords                 |
+|-------------------------------------------------------------------------------------------------|-----------------------|---------------------------|
+| [Process Application - Servlet](deployment/servlet-pa)                                          | All                   | War, Servlet              |
+| [Process Application - EJB](deployment/ejb-pa)                                                  | JavaEE Containers     | Ejb, War                  |
+| [Process Application - Jakarta EJB](deployment/ejb-pa-jakarta)                                  | Jakarta EE Containers | Ejb, War                  |
+| [Process Application - Spring 5 Servlet - WildFly](deployment/spring-servlet-pa-wildfly)        | WildFly               | Spring, Servlet, War      |
+| [Process Application - Spring 5 Servlet - Embedded Tomcat](deployment/spring-servlet-pa-tomcat) | Tomcat                | Spring, Servlet, War      |
+| [Embedded Spring 5 with embedded REST](deployment/embedded-spring-rest)                         | vanilla Apache Tomcat | Spring, Rest, Embedded    |
+| [Plain Spring 5 Web application - WildFly](deployment/spring-wildfly-non-pa)                    | WildFly               | Spring, Jndi, War         |
+| [Process Application - Spring Boot](deployment/spring-boot) [^1]                                | Spring Boot           | Spring                    |
 
 ### Process Engine Plugin Examples
 
@@ -255,4 +256,4 @@ The source files in this repository are made available under the [Apache License
 
 [^1]: _This example is not actively maintained anymore._
 
-[^2]: _Complete demo applications_
+[^2]: _Complete demo applications_
diff --git a/bpmn-model-api/generate-process-fluent-api/pom.xml b/bpmn-model-api/generate-process-fluent-api/pom.xml
@@ -7,12 +7,15 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <version.camunda>7.19.0</version.camunda>
+    <version.camunda>7.20.0</version.camunda>
     <version.junit>4.13.2</version.junit>
     <version.h2>2.1.214</version.h2>
     <version.slf4j>1.7.26</version.slf4j>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+
+    <!-- maven -->
+    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <failOnMissingWebXml>false</failOnMissingWebXml>
   </properties>
@@ -66,4 +69,13 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven.compiler.plugin.version}</version>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/...process-fluent-api/src/test/java/org/camunda/bpm/quickstart/CreateInvoiceProcessTest.java b/...process-fluent-api/src/test/java/org/camunda/bpm/quickstart/CreateInvoiceProcessTest.java
@@ -39,6 +39,7 @@ public class CreateInvoiceProcessTest {
   @Test
   public void testCreateInvoiceProcess() throws Exception {
     BpmnModelInstance modelInstance = Bpmn.createExecutableProcess("invoice")
+        .camundaHistoryTimeToLive(180)
       .name("BPMN API Invoice Process")
       .startEvent()
         .name("Invoice received")

diff --git a/bpmn-model-api/parse-bpmn/pom.xml b/bpmn-model-api/parse-bpmn/pom.xml
@@ -10,11 +10,14 @@
   <name>Parse BPMN by model API</name>
 
   <properties>
-    <version.camunda>7.19.0</version.camunda>
+    <version.camunda>7.20.0</version.camunda>
     <version.junit>4.13.2</version.junit>
     <version.assertj>3.22.0</version.assertj>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+
+    <!-- maven -->
+    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -40,6 +43,15 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven.compiler.plugin.version}</version>
+      </plugin>
+    </plugins>
+  </build>
+
   <repositories>
     <repository>
       <id>camunda-bpm-nexus</id>

diff --git a/clients/java/order-handling/pom.xml b/clients/java/order-handling/pom.xml
@@ -11,11 +11,11 @@
   <name>order-handling-example</name>
 
   <properties>
-    <camunda.platform.version>7.19.0</camunda.platform.version>
+    <camunda.platform.version>7.20.0</camunda.platform.version>
     <slf4j.version>1.7.36</slf4j.version>
     <jaxb.version>2.3.6</jaxb.version>
-    <maven.compiler.version>3.8.1</maven.compiler.version>
-    <java.version>8</java.version>
+    <maven.compiler.version>3.11.0</maven.compiler.version>
+    <maven.compiler.release>11</maven.compiler.release>
   </properties>
 
   <dependencies>
@@ -30,26 +30,13 @@
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>jdk9-plus</id>
-
-      <activation>
-        <jdk>(1.8,)</jdk>
-      </activation>
-
-      <dependencies>
-        <dependency>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-          <version>${jaxb.version}</version>
-        </dependency>
-      </dependencies>
 
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxb.version}</version>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>

diff --git a/cockpit/cockpit-bpmn-js-module-bundled/README.md b/cockpit/cockpit-bpmn-js-module-bundled/README.md
@@ -4,7 +4,7 @@ This example shows how to develop, bundle and include a bpmn-js custom module in
 
 For additional information, please also see the [documentation](https://docs.camunda.org/manual/latest/webapps/cockpit/extend/configuration/#bpmn-diagram-viewer-bpmn-js).
 
-Built and tested against Camunda Platform version `7.19.0`.
+Built and tested against Camunda Platform version `7.20.0`.
 
 ![Screenshot](screenshot.png)
 

diff --git a/cockpit/cockpit-bpmn-js-module-bundled/dist/custom-renderer-module-bundled.js b/cockpit/cockpit-bpmn-js-module-bundled/dist/custom-renderer-module-bundled.js
@@ -368,9 +368,11 @@ function create(name, attrs) {
 /**
  * Flatten array, one level deep.
  *
- * @param {Array<?>} arr
+ * @template T
  *
- * @return {Array<?>}
+ * @param {T[][]} arr
+ *
+ * @return {T[]}
  */
 
 const nativeToString = Object.prototype.toString;
@@ -384,6 +386,11 @@ function isArray(obj) {
   return nativeToString.call(obj) === '[object Array]';
 }
 
+/**
+ * @param {any} obj
+ *
+ * @return {boolean}
+ */
 function isFunction(obj) {
   const tag = nativeToString.call(obj);
 
@@ -408,22 +415,74 @@ function has(target, key) {
   return nativeHasOwnProperty.call(target, key);
 }
 
+/**
+ * @template T
+ * @typedef { (
+ *   ((e: T) => boolean) |
+ *   ((e: T, idx: number) => boolean) |
+ *   ((e: T, key: string) => boolean) |
+ *   string |
+ *   number
+ * ) } Matcher
+ */
+
+/**
+ * @template T
+ * @template U
+ *
+ * @typedef { (
+ *   ((e: T) => U) | string | number
+ * ) } Extractor
+ */
+
+
+/**
+ * @template T
+ * @typedef { (val: T, key: any) => boolean } MatchFn
+ */
+
+/**
+ * @template T
+ * @typedef { T[] } ArrayCollection
+ */
+
+/**
+ * @template T
+ * @typedef { { [key: string]: T } } StringKeyValueCollection
+ */
+
+/**
+ * @template T
+ * @typedef { { [key: number]: T } } NumberKeyValueCollection
+ */
+
+/**
+ * @template T
+ * @typedef { StringKeyValueCollection<T> | NumberKeyValueCollection<T> } KeyValueCollection
+ */
+
+/**
+ * @template T
+ * @typedef { KeyValueCollection<T> | ArrayCollection<T> } Collection
+ */
+
 /**
  * Find element in collection.
  *
- * @param  {Array|Object} collection
- * @param  {Function|Object} matcher
+ * @template T
+ * @param {Collection<T>} collection
+ * @param {Matcher<T>} matcher
  *
  * @return {Object}
  */
 function find(collection, matcher) {
 
-  matcher = toMatcher(matcher);
+  const matchFn = toMatcher(matcher);
 
   let match;
 
   forEach(collection, function(val, key) {
-    if (matcher(val, key)) {
+    if (matchFn(val, key)) {
       match = val;
 
       return false;
@@ -439,10 +498,11 @@ function find(collection, matcher) {
  * Iterate over collection; returning something
  * (non-undefined) will stop iteration.
  *
- * @param  {Array|Object} collection
- * @param  {Function} iterator
+ * @template T
+ * @param {Collection<T>} collection
+ * @param { ((item: T, idx: number) => (boolean|void)) | ((item: T, key: string) => (boolean|void)) } iterator
  *
- * @return {Object} return result that stopped the iteration
+ * @return {T} return result that stopped the iteration
  */
 function forEach(collection, iterator) {
 
@@ -485,6 +545,12 @@ function some(collection, matcher) {
 }
 
 
+/**
+ * @template T
+ * @param {Matcher<T>} matcher
+ *
+ * @return {MatchFn<T>}
+ */
 function toMatcher(matcher) {
   return isFunction(matcher) ? matcher : (e) => {
     return e === matcher;
@@ -595,6 +661,7 @@ function getRoundRectPath(shape, borderRadius) {
  * limitations under the License.
  */
 
+
 const HIGH_PRIORITY = 1500,
       TASK_BORDER_RADIUS = 2;
 
@@ -688,6 +755,7 @@ function prependTo(newNode, parentNode, siblingNode) {
  * limitations under the License.
  */
 
+
 var index = {
   __init__: [ 'customRenderer' ],
   customRenderer: [ 'type', CustomRenderer ]