Merge branch 'release/0.3.0'

holunda-io · Nov 22, 2022 · e3644a6 · e3644a6
2 parents eff3a7e + 3c7d54a
commit e3644a6
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 61 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,3 +5,6 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  default-labels:
+      - "Type: dependencies"
+
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Camunda BPM JGiven
 Camunda specific stages and scenarios for the BDD testing tool JGiven written in Kotlin.
 
-
+[![stable](https://img.shields.io/badge/lifecycle-STABLE-green.svg)](https://github.com/holisticon#open-source-lifecycle)
 [![Development braches](https://github.com/holunda-io/camunda-bpm-jgiven/workflows/Development%20braches/badge.svg)](https://github.com/holunda-io/camunda-bpm-jgiven/workflows) 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.holunda.testing/camunda-bpm-jgiven/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.holunda.testing/camunda-bpm-jgiven)
 

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.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit5</artifactId>
@@ -31,17 +31,6 @@
       <groupId>org.camunda.bpm.springboot</groupId>
       <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.camunda.bpm.assert</groupId>
-          <artifactId>camunda-bpm-assert-assertj3-11-1</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.camunda.bpm.assert</groupId>
-      <artifactId>camunda-bpm-assert</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.camunda.bpm.extension</groupId>
@@ -55,9 +44,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.extension</groupId>
-      <artifactId>camunda-bpm-process-test-coverage</artifactId>
-      <version>0.4.0</version>
+      <groupId>org.camunda.community.process_test_coverage</groupId>
+      <artifactId>camunda-process-test-coverage-junit4-platform-7</artifactId>
+      <version>${camunda-process-test-coverage.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/examples/basic/pom.xml b/examples/basic/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic</artifactId>
@@ -22,9 +22,9 @@
       <artifactId>h2</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.extension.mockito</groupId>
-      <artifactId>camunda-bpm-mockito</artifactId>
-      <version>5.16.0</version>
+      <groupId>org.camunda.community.mockito</groupId>
+      <artifactId>camunda-platform-7-mockito</artifactId>
+      <version>6.17.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -36,27 +36,16 @@
       <groupId>org.camunda.bpm.springboot</groupId>
       <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.camunda.bpm.assert</groupId>
-          <artifactId>camunda-bpm-assert-assertj3-11-1</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.camunda.bpm.assert</groupId>
-      <artifactId>camunda-bpm-assert</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.holunda.testing</groupId>
       <artifactId>camunda-bpm-jgiven</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.extension</groupId>
-      <artifactId>camunda-bpm-process-test-coverage</artifactId>
-      <version>0.4.0</version>
+      <groupId>org.camunda.community.process_test_coverage</groupId>
+      <artifactId>camunda-process-test-coverage-junit4-platform-7</artifactId>
+      <version>${camunda-process-test-coverage.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/examples/basic/src/test/kotlin/io/holunda/testing/examples/basic/ApprovalProcessStages.kt b/examples/basic/src/test/kotlin/io/holunda/testing/examples/basic/ApprovalProcessStages.kt
@@ -16,8 +16,8 @@ import org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareTests.externalTask
 import org.camunda.bpm.engine.test.mock.Mocks
 import org.camunda.bpm.engine.variable.Variables
 import org.camunda.bpm.engine.variable.Variables.putValue
-import org.camunda.bpm.extension.mockito.CamundaMockito.getJavaDelegateMock
-import org.camunda.bpm.extension.mockito.CamundaMockito.registerJavaDelegateMock
+import org.camunda.community.mockito.DelegateExpressions.getJavaDelegateMock
+import org.camunda.community.mockito.DelegateExpressions.registerJavaDelegateMock
 
 @JGivenProcessStage
 class ApprovalProcessActionStage : ProcessStage<ApprovalProcessActionStage, ApprovalProcessBean>() {

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,14 +6,15 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples</artifactId>
   <packaging>pom</packaging>
 
   <properties>
-    <spring-boot.version>2.6.4</spring-boot.version>
+    <spring-boot.version>2.7.5</spring-boot.version>
+    <camunda-process-test-coverage.version>2.0.0</camunda-process-test-coverage.version>
   </properties>
 
   <modules>

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.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven</artifactId>
@@ -55,7 +55,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.assert</groupId>
+      <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-bpm-assert</artifactId>
       <scope>provided</scope>
     </dependency>

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.2.0</version>
+  <version>0.3.0</version>
   <packaging>pom</packaging>
 
 
@@ -15,15 +15,14 @@
 
 
   <properties>
-    <camunda.version>7.16.0</camunda.version>
-    <jgiven.version>1.2.0</jgiven.version>
+    <camunda.version>7.18.0</camunda.version>
+    <jgiven.version>1.2.4</jgiven.version>
     <junit.version>4.13.2</junit.version>
-    <assertj.version>3.19.0</assertj.version>
-    <camunda-bpm-assert.version>13.0.0</camunda-bpm-assert.version>
-    <jgiven-kotlin.version>1.0.1</jgiven-kotlin.version>
+    <assertj.version>3.23.1</assertj.version>
+    <jgiven-kotlin.version>1.2.4.0</jgiven-kotlin.version>
 
     <java.version>11</java.version>
-    <kotlin.version>1.6.10</kotlin.version>
+    <kotlin.version>1.7.21</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>
@@ -81,16 +80,16 @@
         <artifactId>camunda-engine</artifactId>
         <version>${camunda.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.camunda.bpm.assert</groupId>
-        <artifactId>camunda-bpm-assert</artifactId>
-        <version>${camunda-bpm-assert.version}</version>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${junit.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.camunda.bpm</groupId>
+        <artifactId>camunda-bpm-assert</artifactId>
+        <version>${camunda.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -123,7 +122,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <id>enforce-maven</id>
@@ -148,14 +147,14 @@
           <!-- cleaning -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.0</version>
         </plugin>
 
         <plugin>
           <!-- java compiler -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.0</version>
+          <version>3.10.1</version>
           <configuration>
             <encoding>UTF-8</encoding>
             <source>${java.version}</source>
@@ -193,7 +192,7 @@
           <!-- resources -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -203,7 +202,7 @@
           <!-- git flow -->
           <groupId>com.amashchenko.maven.plugin</groupId>
           <artifactId>gitflow-maven-plugin</artifactId>
-          <version>1.18.0</version>
+          <version>1.19.0</version>
           <configuration>
             <gitFlowConfig>
               <productionBranch>master</productionBranch>
@@ -299,7 +298,7 @@
           <!-- javadoc for kotlin -->
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.6.10</version>
+          <version>1.7.20</version>
           <executions>
             <execution>
               <phase>test</phase>
@@ -378,15 +377,15 @@
         <!-- Deploy -->
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M2</version>
+          <version>3.0.0</version>
           <configuration>
             <skip>true</skip>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.sonatype.plugins</groupId>
           <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>1.6.12</version>
+          <version>1.6.13</version>
           <executions>
             <execution>
               <id>default-deploy</id>
@@ -406,7 +405,7 @@
         <!-- Install -->
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.1.0</version>
         </plugin>
 
       </plugins>