Merge branch 'release/1.19.0'

holunda-io · Oct 9, 2023 · a2a95d3 · a2a95d3
2 parents 7a51d71 + 58da4fc
commit a2a95d3
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 61 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -1,4 +1,4 @@
-name: Development braches
+name: Development branches
 
 on:
   push:
@@ -10,10 +10,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk: ['11.0.5']
     steps:
 
       - name: Checkout code
@@ -22,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.jdk }}
+          java-version: 17
           distribution: zulu
           cache: maven
 

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -20,10 +20,10 @@ jobs:
         run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes
 
       # Setup JDK and Maven
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11.0.5
+          java-version: 17
           distribution: zulu
           cache: maven
           server-id: ossrh

diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-11
+17
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/examples/basic/pom.xml → examples/basic-junit4/pom.xml b/examples/basic/pom.xml → examples/basic-junit4/pom.xml
@@ -6,10 +6,10 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>0.4.1</version>
+    <version>1.19.0</version>
   </parent>
 
-  <artifactId>camunda-bpm-jgiven-examples-basic</artifactId>
+  <artifactId>camunda-bpm-jgiven-examples-basic-junit4</artifactId>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/...ing/examples/basic/ApprovalProcessBean.kt → ...ing/examples/basic/ApprovalProcessBean.kt b/...ing/examples/basic/ApprovalProcessBean.kt → ...ing/examples/basic/ApprovalProcessBean.kt
diff --git a/...examples/basic/BasicProcessApplication.kt → ...examples/basic/BasicProcessApplication.kt b/...examples/basic/BasicProcessApplication.kt → ...examples/basic/BasicProcessApplication.kt
diff --git a/...src/main/resources/META-INF/processes.xml → ...src/main/resources/META-INF/processes.xml b/...src/main/resources/META-INF/processes.xml → ...src/main/resources/META-INF/processes.xml
diff --git a/...es/basic/src/main/resources/approval.bpmn → ...c-junit4/src/main/resources/approval.bpmn b/...es/basic/src/main/resources/approval.bpmn → ...c-junit4/src/main/resources/approval.bpmn
diff --git a/...g/examples/basic/ApprovalProcessStages.kt → ...g/examples/basic/ApprovalProcessStages.kt b/...g/examples/basic/ApprovalProcessStages.kt → ...g/examples/basic/ApprovalProcessStages.kt
diff --git a/...ing/examples/basic/ApprovalProcessTest.kt → ...ing/examples/basic/ApprovalProcessTest.kt b/...ing/examples/basic/ApprovalProcessTest.kt → ...ing/examples/basic/ApprovalProcessTest.kt
diff --git a/.../basic/src/test/resources/camunda.cfg.xml → ...junit4/src/test/resources/camunda.cfg.xml b/.../basic/src/test/resources/camunda.cfg.xml → ...junit4/src/test/resources/camunda.cfg.xml
diff --git a/...ples/basic/src/test/resources/logback.xml → ...sic-junit4/src/test/resources/logback.xml b/...ples/basic/src/test/resources/logback.xml → ...sic-junit4/src/test/resources/logback.xml
diff --git a/examples/basic-junit5/pom.xml b/examples/basic-junit5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>0.4.1</version>
+    <version>1.19.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit5</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,20 +6,21 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-parent</artifactId>
-    <version>0.4.1</version>
+    <version>1.19.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples</artifactId>
   <packaging>pom</packaging>
 
   <properties>
-    <spring-boot.version>2.7.5</spring-boot.version>
-    <camunda-process-test-coverage.version>2.0.0</camunda-process-test-coverage.version>
-    <camunda-platform-7-mockito.version>6.18.0</camunda-platform-7-mockito.version>
+    <spring-boot.version>2.7.6</spring-boot.version>
+    <camunda-process-test-coverage.version>2.2.0</camunda-process-test-coverage.version>
+    <camunda-platform-7-mockito.version>6.19.1</camunda-platform-7-mockito.version>
+    <junit.version>4.13.2</junit.version>
   </properties>
 
   <modules>
-    <module>basic</module>
+    <module>basic-junit4</module>
     <module>basic-junit5</module>
   </modules>
 
@@ -68,8 +69,12 @@
         <artifactId>jgiven-junit5</artifactId>
         <version>${jgiven.version}</version>
       </dependency>
-
-
+      <dependency>
+        <!-- for legacy examples only -->
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-parent</artifactId>
-    <version>0.4.1</version>
+    <version>1.19.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven</artifactId>
@@ -30,11 +30,6 @@
       <artifactId>camunda-engine</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

diff --git a/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt b/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt
@@ -98,9 +98,10 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
   @As("process waits in activities $")
   fun process_waits_in(@QuotedVarargs vararg activityId: String) = step {
     require(activityId.isNotEmpty()) { "At least one activity id must be provided" }
-    activityId.map {
-      val job = job(it)
-      assertThat(job).`as`("Expecting the process to be waiting in activity '$it', but it was not.").isNotNull
+
+    val processInstance = processInstanceSupplier.get()
+    activityId.forEach {
+      assertThat(processInstance).isWaitingAt(it)
     }
   }
 
@@ -200,7 +201,7 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
    * @param users list of candidate users that must be candidate.
    * @return fluent stage.
    */
-  fun task_is_visible_to_users(@QuotedVarargs users: Array<String>): SELF = step {
+  fun task_is_visible_to_users(@QuotedVarargs vararg users: String): SELF = step {
     val task = task()
     users.forEach { user -> assertThat(task).hasCandidateUser(user) }
   }
@@ -210,7 +211,7 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
    * @param groups list of candidate groups that must be candidate.
    * @return fluent stage.
    */
-  fun task_is_visible_to_groups(@QuotedVarargs groups: Array<String>): SELF = step {
+  fun task_is_visible_to_groups(@QuotedVarargs vararg groups: String): SELF = step {
     val task = task()
     groups.forEach { group -> assertThat(task).hasCandidateGroup(group) }
   }
@@ -320,7 +321,7 @@ class ProcessStage<SELF : ProcessStage<SELF, PROCESS_BEAN>, PROCESS_BEAN : Suppl
    * @return fluent stage.
    */
   @As("variables $ are not present")
-  fun variables_are_not_present(@QuotedVarargs variableNames: Array<String>): SELF = step {
+  fun variables_are_not_present(@QuotedVarargs vararg variableNames: String): SELF = step {
     assertThat(processInstanceSupplier.get())
       .`as`("variables ${variableNames.joinToString(", ")} should not be present")
       .variables().doesNotContainKeys(*variableNames)

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.holunda.testing</groupId>
   <artifactId>camunda-bpm-jgiven-parent</artifactId>
-  <version>0.4.1</version>
+  <version>1.19.0</version>
   <packaging>pom</packaging>
 
 
@@ -15,14 +15,13 @@
 
 
   <properties>
-    <camunda.version>7.18.0</camunda.version>
-    <jgiven.version>1.2.5</jgiven.version>
-    <junit.version>4.13.2</junit.version>
+    <camunda.version>7.19.0</camunda.version>
+    <jgiven.version>1.3.0</jgiven.version>
     <assertj.version>3.24.2</assertj.version>
-    <jgiven-kotlin.version>1.2.5.0</jgiven-kotlin.version>
+    <jgiven-kotlin.version>1.3.0.0</jgiven-kotlin.version>
 
-    <java.version>11</java.version>
-    <kotlin.version>1.8.10</kotlin.version>
+    <java.version>17</java.version>
+    <kotlin.version>1.9.10</kotlin.version>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
     <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -56,11 +55,6 @@
         <artifactId>jgiven-junit5</artifactId>
         <version>${jgiven.version}</version>
       </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
@@ -107,13 +101,16 @@
   <build>
     <defaultGoal>clean package</defaultGoal>
 
+    <sourceDirectory>src/main/kotlin</sourceDirectory>
+    <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+
     <pluginManagement>
       <plugins>
         <!-- Enforce correct Java and Maven -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.2.1</version>
+          <version>3.4.1</version>
           <executions>
             <execution>
               <id>enforce-maven</id>
@@ -123,7 +120,7 @@
               <configuration>
                 <rules>
                   <requireMavenVersion>
-                    <version>3.6.0</version>
+                    <version>3.9.0</version>
                   </requireMavenVersion>
                   <requireJavaVersion>
                     <version>${java.version}</version>
@@ -138,7 +135,7 @@
           <!-- cleaning -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.1</version>
         </plugin>
 
         <plugin>
@@ -152,12 +149,10 @@
             <target>${java.version}</target>
           </configuration>
           <executions>
-            <!-- Replacing default-compile as it is treated specially by maven -->
             <execution>
               <id>default-compile</id>
               <phase>none</phase>
             </execution>
-            <!-- Replacing default-testCompile as it is treated specially by maven -->
             <execution>
               <id>default-testCompile</id>
               <phase>none</phase>
@@ -182,20 +177,20 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.2</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.2</version>
         </plugin>
 
         <plugin>
           <!-- resources -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -205,7 +200,7 @@
           <!-- git flow -->
           <groupId>com.amashchenko.maven.plugin</groupId>
           <artifactId>gitflow-maven-plugin</artifactId>
-          <version>1.19.0</version>
+          <version>1.20.0</version>
           <configuration>
             <gitFlowConfig>
               <productionBranch>master</productionBranch>
@@ -229,8 +224,8 @@
           <version>${kotlin.version}</version>
           <configuration>
             <jvmTarget>${java.version}</jvmTarget>
-            <languageVersion>1.5</languageVersion>
-            <apiVersion>1.5</apiVersion>
+            <languageVersion>1.9</languageVersion>
+            <apiVersion>1.9</apiVersion>
             <compilerPlugins>
               <plugin>spring</plugin>
               <plugin>jpa</plugin>
@@ -301,7 +296,7 @@
           <!-- javadoc for kotlin -->
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.8.10</version>
+          <version>1.9.0</version>
           <executions>
             <execution>
               <phase>test</phase>
@@ -317,7 +312,7 @@
           <!-- source from kotlin -->
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.0</version>
           <executions>
             <execution>
               <phase>generate-sources</phase>
@@ -337,7 +332,7 @@
           <!-- attach sources -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.2.1</version>
+          <version>3.3.0</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -357,7 +352,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.1.0</version>
           <configuration>
             <gpgArguments>
               <arg>--batch</arg>
@@ -380,7 +375,7 @@
         <!-- Deploy -->
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.1.1</version>
           <configuration>
             <skip>true</skip>
           </configuration>
@@ -408,7 +403,7 @@
         <!-- Install -->
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.1.1</version>
         </plugin>
 
       </plugins>
@@ -521,6 +516,13 @@
       <organization>Holisticon AG</organization>
       <organizationUrl>https://www.holisticon.de</organizationUrl>
     </developer>
+    <developer>
+      <id>jangalinski</id>
+      <name>Jan Galinski</name>
+      <email>[email protected]</email>
+      <organization>Holisticon AG</organization>
+      <organizationUrl>https://www.holisticon.de</organizationUrl>
+    </developer>
   </developers>