From 075cacdebd48edb881e74ace453e48ff032df8d2 Mon Sep 17 00:00:00 2001 From: Tobias Schaefer Date: Sat, 8 Oct 2022 20:16:53 +0200 Subject: [PATCH] Update to Camunda 7.18 --- README.md | 14 +++++++------- gradle.properties | 2 +- micronaut-camunda-bpm-feature/build.gradle | 1 - .../camunda/bpm/feature/MnExpressionManager.java | 7 ++----- .../eventing/PublishDelegateParseListener.java | 6 ++++++ 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ffaa85d1..6cecf47c 100644 --- a/README.md +++ b/README.md @@ -447,8 +447,8 @@ implementation("info.novatec:micronaut-camunda-bpm-feature:2.9.0") { exclude group: 'org.camunda.bpm', module: 'camunda-engine' } -implementation("org.camunda.bpm.webapp:camunda-webapp-webjar-ee:7.17.0-ee") -implementation("org.camunda.bpm:camunda-engine:7.17.0-ee") +implementation("org.camunda.bpm.webapp:camunda-webapp-webjar-ee:7.18.0-ee") +implementation("org.camunda.bpm:camunda-engine:7.18.0-ee") ```
@@ -474,12 +474,12 @@ In `pom.xml`: org.camunda.bpm.webapp camunda-webapp-webjar-ee - 7.17.0-ee + 7.18.0-ee org.camunda.bpm camunda-engine - 7.17.0-ee + 7.18.0-ee ```
@@ -506,7 +506,7 @@ You can either Example with the LDAP plugin: ```groovy -implementation("org.camunda.bpm.identity:camunda-identity-ldap:7.17.0") +implementation("org.camunda.bpm.identity:camunda-identity-ldap:7.18.0") ``` ```java @@ -789,7 +789,7 @@ Process tests can easily be implemented with JUnit 5 by adding the `camunda-bpm- Click to show Gradle dependencies ```groovy -testImplementation("org.camunda.bpm:camunda-bpm-assert:7.17.0") +testImplementation("org.camunda.bpm:camunda-bpm-assert:7.18.0") testImplementation("org.assertj:assertj-core") ``` @@ -801,7 +801,7 @@ testImplementation("org.assertj:assertj-core") org.camunda.bpm camunda-bpm-assert - 7.17.0 + 7.18.0 test diff --git a/gradle.properties b/gradle.properties index dfc72405..66d66636 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ micronautLibraryPluginVersion=3.6.2 jettyVersion=9.4.48.v20220622 tomcatVersion=9.0.65 undertowVersion=2.2.18.Final -camundaVersion=7.17.0 +camundaVersion=7.18.0 # Latest Jersey, that implements JAX-RS 2.1 API: see https://eclipse-ee4j.github.io/jersey/download.html jerseyVersion=2.37 # Prevent upload of maven-metadata.xml.sha256/sha512 files to oss.sonatype.org diff --git a/micronaut-camunda-bpm-feature/build.gradle b/micronaut-camunda-bpm-feature/build.gradle index 315a5219..d561b2a9 100644 --- a/micronaut-camunda-bpm-feature/build.gradle +++ b/micronaut-camunda-bpm-feature/build.gradle @@ -46,7 +46,6 @@ dependencies { // REST API + Webapps implementation("com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider") - implementation("org.camunda.bpm:camunda-engine-rest-jaxrs2:$camundaVersion") implementation("org.camunda.bpm.webapp:camunda-webapp-webjar:$camundaVersion") implementation("org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion") implementation("org.glassfish.jersey.containers:jersey-container-servlet-core:$jerseyVersion") diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnExpressionManager.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnExpressionManager.java index 31d05981..7e963c45 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnExpressionManager.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnExpressionManager.java @@ -15,17 +15,14 @@ */ package info.novatec.micronaut.camunda.bpm.feature; -import org.camunda.bpm.engine.impl.el.ExpressionManager; -import org.camunda.bpm.engine.impl.el.ReadOnlyMapELResolver; -import org.camunda.bpm.engine.impl.el.VariableContextElResolver; -import org.camunda.bpm.engine.impl.el.VariableScopeElResolver; +import org.camunda.bpm.engine.impl.el.*; import org.camunda.bpm.engine.impl.javax.el.*; /** * @author Tobias Schäfer */ // Implementation based on https://github.com/camunda/camunda-bpm-platform/blob/master/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/SpringExpressionManager.java -public class MnExpressionManager extends ExpressionManager { +public class MnExpressionManager extends JuelExpressionManager { protected final ApplicationContextElResolver applicationContextElResolver; diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java index 1eaec6b5..1aea612e 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java @@ -23,6 +23,7 @@ import org.camunda.bpm.engine.delegate.TaskListener; import org.camunda.bpm.engine.impl.bpmn.behavior.UserTaskActivityBehavior; import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParseListener; +import org.camunda.bpm.engine.impl.core.variable.mapping.IoMapping; import org.camunda.bpm.engine.impl.persistence.entity.ProcessDefinitionEntity; import org.camunda.bpm.engine.impl.pvm.process.ActivityImpl; import org.camunda.bpm.engine.impl.pvm.process.ScopeImpl; @@ -256,6 +257,11 @@ public void parseConditionalStartEventForEventSubprocess(Element element, Activi // Do not implement. Start and end event listener are set by parseBoundaryEvent() } + @Override + public void parseIoMapping(Element extensionElements, ActivityImpl activity, IoMapping inputOutput) { + // Do not implement + } + @Override public void parseRootElement(Element rootElement, List processDefinitions) { // Do not implement