Merge branch 'release/1.1.1'

holunda-io · Oct 19, 2020 · 634283f · 634283f
2 parents b355821 + cf6c491
commit 634283f
Show file tree

Hide file tree

Showing 20 changed files with 235 additions and 187 deletions.
diff --git a/README.adoc b/README.adoc
@@ -51,20 +51,20 @@ If you just want to start using the library, put the following dependency into y
 <dependency>
   <groupId>io.holunda.data</groupId>
   <artifactId>camunda-bpm-data</artifactId>
-  <version>1.0.2</version>
+  <version>1.1.0</version>
 </dependency>
 ----
 
 If you are using Gradle Kotlin DSL add to your `build.gradle.kts`:
 [source,kotlin]
 ----
-implementation("io.holunda.data:camunda-bpm-data:1.0.2")
+implementation("io.holunda.data:camunda-bpm-data:1.1.0")
 ----
 
 For Gradle Groovy DSL add to your `build.gradle`:
 [source,groovy]
 ----
-implementation 'io.holunda.data:camunda-bpm-data:1.0.2'
+implementation 'io.holunda.data:camunda-bpm-data:1.1.0'
 ----
 
 === Variable declaration

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.data</groupId>
     <artifactId>camunda-bpm-data-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-data-docs</artifactId>

diff --git a/docs/src/orchid/resources/changelog/1.1/1.1.1.ad b/docs/src/orchid/resources/changelog/1.1/1.1.1.ad
@@ -0,0 +1,13 @@
+---
+version: 1.1.1
+---
+
+== Features
+
+* Implement ACL `checkAndTransformAndWrap`, see #77
+
+== Chore
+
+* Switch to JUnit 4.13.1
+
+
diff --git a/example/coverage-report-aggregator/pom.xml b/example/coverage-report-aggregator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.data.example</groupId>
     <artifactId>camunda-bpm-data-example-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-data-coverage-report</artifactId>

diff --git a/example/example-java/pom.xml b/example/example-java/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.data.example</groupId>
     <artifactId>camunda-bpm-data-example-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-data-example-java</artifactId>

diff --git a/example/example-kotlin/pom.xml b/example/example-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.data.example</groupId>
     <artifactId>camunda-bpm-data-example-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-data-example-kotlin</artifactId>

diff --git a/example/itest/pom.xml b/example/itest/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.data.example</groupId>
     <artifactId>camunda-bpm-data-example-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
 
   <artifactId>camunda-bpm-data-integration-test</artifactId>

diff --git a/example/itest/src/test/kotlin/itest/ActionStage.kt b/example/itest/src/test/kotlin/itest/ActionStage.kt
@@ -15,6 +15,7 @@ import org.camunda.bpm.engine.variable.VariableMap
 import org.camunda.bpm.engine.variable.Variables
 import org.camunda.bpm.model.bpmn.Bpmn
 import org.camunda.bpm.model.bpmn.BpmnModelInstance
+import org.junit.Assert.assertThrows
 import org.springframework.beans.factory.annotation.Autowired
 
 /**
@@ -146,11 +147,19 @@ class ActionStage : Stage<ActionStage>() {
    */
   fun process_is_started_with_variables(
     processDefinitionKey: String = this.processDefinition.key,
-    variables: VariableMap
+    variables: VariableMap,
+    expectedException: Class<out java.lang.Exception>? = null
   ): ActionStage {
 
-    processInstance = runtimeService
-      .startProcessInstanceByKey(processDefinitionKey, variables)
+    if (expectedException == null) {
+      processInstance = runtimeService
+        .startProcessInstanceByKey(processDefinitionKey, variables)
+    } else {
+      assertThrows(expectedException) {
+        runtimeService
+          .startProcessInstanceByKey(processDefinitionKey, variables)
+      }
+    }
 
     return self()
   }