Merge branch 'main' of github.com:flowable/flowable-engine

flowable · Jun 19, 2023 · 67f899b · 67f899b
2 parents a338057 + 9f6d3a2
commit 67f899b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 33 deletions.
diff --git a/distro/src/notice.txt b/distro/src/notice.txt
@@ -70,10 +70,10 @@ Quartz
 This software includes unchanged copies of the following libraries:
 
 aopalliance                     aopalliance                 1.0             Public Domain
-com.fasterxml.jackson.core      jackson-annotations         2.14.2          The Apache Software License, Version 2.0
-com.fasterxml.jackson.core      jackson-core                2.14.2          The Apache Software License, Version 2.0
-com.fasterxml.jackson.core      jackson-databind            2.14.2          The Apache Software License, Version 2.0
-com.fasterxml.jackson.datatype  jackson-datatype-joda       2.14.2          The Apache Software License, Version 2.0
+com.fasterxml.jackson.core      jackson-annotations         2.14.3          The Apache Software License, Version 2.0
+com.fasterxml.jackson.core      jackson-core                2.14.3          The Apache Software License, Version 2.0
+com.fasterxml.jackson.core      jackson-databind            2.14.3          The Apache Software License, Version 2.0
+com.fasterxml.jackson.datatype  jackson-datatype-joda       2.14.3          The Apache Software License, Version 2.0
 com.google.guava                guava                       31.0.1-jre      The Apache Software License, Version 2.0
 com.h2database                  h2                          2.1.214         The H2 License, Version 1.0
 com.fasterxml.uuid              java-uuid-generator         3.3.0           The Apache Software License, Version 2.0
@@ -101,26 +101,26 @@ org.apache.httpcomponents       httpcore                    4.4.15          Apac
 org.apache.httpcomponents       httpmime                    4.5.13          Apache License, Version 2.0
 org.apache.geronimo.bundles     json                        20090211_1      The Apache Software License, Version 2.0
 org.apache.groovy               groovy                      4.0.10          The Apache Software License, Version 2.0
-org.apache.groovy               groovy-jsr223               4.0.10          The Apache Software License, Version 2.0
+org.apache.groovy               groovy-jsr223               4.0.12          The Apache Software License, Version 2.0
 org.liquibase                   liquibase-core              4.5.0           Apache License, Version 2.0
 org.mybatis                     mybatis                     3.5.11          The Apache Software License, Version 2.0
 org.mybatis                     mybatis-spring              3.0.0           The Apache Software License, Version 2.0
 org.mvel                        mvel2                       2.2.6.Final     The Apache Software License, Version 2.0
 org.slf4j                       jcl-over-slf4j              2.0.7           MIT License
 org.slf4j                       slf4j-api                   2.0.7           MIT License
 org.slf4j                       slf4j-log4j12               2.0.7           MIT License
-org.springframework             spring-beans                6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-core                 6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-context              6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-context-support      6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-jdbc                 6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-tx                   6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-web                  6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-webmvc               6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-aop                  6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-core                 6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-expression           6.0.8           The Apache Software License, Version 2.0
-org.springframework             spring-orm                  6.0.8           The Apache Software License, Version 2.0
+org.springframework             spring-beans                6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-core                 6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-context              6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-context-support      6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-jdbc                 6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-tx                   6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-web                  6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-webmvc               6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-aop                  6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-core                 6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-expression           6.0.9           The Apache Software License, Version 2.0
+org.springframework             spring-orm                  6.0.9           The Apache Software License, Version 2.0
 org.springframework.security    spring-security-config      6.0.3           The Apache Software License, Version 2.0
 org.springframework.security    spring-security-core        6.0.3           The Apache Software License, Version 2.0
 org.springframework.security    spring-security-crypto      6.0.3           The Apache Software License, Version 2.0

diff --git a/...e-bpmn-converter/src/main/java/org/flowable/bpmn/converter/BoundaryEventXMLConverter.java b/...e-bpmn-converter/src/main/java/org/flowable/bpmn/converter/BoundaryEventXMLConverter.java
@@ -24,7 +24,6 @@
 import org.flowable.bpmn.constants.BpmnXMLConstants;
 import org.flowable.bpmn.converter.child.BaseChildElementParser;
 import org.flowable.bpmn.converter.child.InParameterParser;
-import org.flowable.bpmn.converter.child.OutParameterParser;
 import org.flowable.bpmn.converter.child.VariableListenerEventDefinitionParser;
 import org.flowable.bpmn.converter.util.BpmnXMLUtil;
 import org.flowable.bpmn.model.BaseElement;

diff --git a/...-converter/src/test/java/org/flowable/editor/language/xml/EndErrorEventConverterTest.java b/...-converter/src/test/java/org/flowable/editor/language/xml/EndErrorEventConverterTest.java
@@ -19,7 +19,6 @@
 import org.flowable.bpmn.model.EndEvent;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.IOParameter;
-import org.flowable.bpmn.model.StartEvent;
 import org.flowable.editor.language.xml.util.BpmnXmlConverterTest;
 
 /**

diff --git a/...onverter/src/test/java/org/flowable/editor/language/xml/StartErrorEventConverterTest.java b/...onverter/src/test/java/org/flowable/editor/language/xml/StartErrorEventConverterTest.java
@@ -15,7 +15,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 
-import org.flowable.bpmn.model.BoundaryEvent;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.IOParameter;

diff --git a/...e/src/test/java/org/flowable/cmmn/test/runtime/VariableInstanceValueModifierCmmnTest.java b/...e/src/test/java/org/flowable/cmmn/test/runtime/VariableInstanceValueModifierCmmnTest.java
@@ -14,7 +14,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.groups.Tuple.tuple;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -26,12 +25,10 @@
 import org.flowable.cmmn.engine.test.CmmnDeployment;
 import org.flowable.cmmn.engine.test.FlowableCmmnTestCase;
 import org.flowable.cmmn.engine.test.impl.CmmnHistoryTestHelper;
-import org.flowable.cmmn.engine.test.impl.CmmnTestHelper;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
 import org.flowable.common.engine.impl.history.HistoryLevel;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.history.HistoricTaskInstance;
-import org.flowable.variable.api.event.FlowableVariableEvent;
 import org.flowable.variable.api.history.HistoricVariableInstance;
 import org.flowable.variable.api.persistence.entity.VariableInstance;
 import org.flowable.variable.api.types.ValueFields;
@@ -40,7 +37,6 @@
 import org.flowable.variable.service.VariableServiceConfiguration;
 import org.flowable.variable.service.impl.DefaultVariableInstanceValueModifier;
 import org.flowable.variable.service.impl.VariableInstanceValueModifier;
-import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
 import org.flowable.variable.service.impl.types.IntegerType;
 import org.junit.After;
 import org.junit.Before;

diff --git a/...le-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java b/...le-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java
@@ -40,7 +40,6 @@
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.FlowElementsContainer;
 import org.flowable.bpmn.model.Gateway;
-import org.flowable.bpmn.model.IOParameter;
 import org.flowable.bpmn.model.MessageEventDefinition;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.Signal;

diff --git a/...es/flowable-engine/src/main/java/org/flowable/engine/impl/util/EventSubscriptionUtil.java b/...es/flowable-engine/src/main/java/org/flowable/engine/impl/util/EventSubscriptionUtil.java
@@ -17,9 +17,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.Event;
 import org.flowable.bpmn.model.FlowNode;
-import org.flowable.bpmn.model.IOParameter;
 import org.flowable.common.engine.api.FlowableException;
-import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.common.engine.impl.el.ExpressionManager;
 import org.flowable.common.engine.impl.el.VariableContainerWrapper;
 import org.flowable.common.engine.impl.interceptor.CommandContext;

diff --git a/.../flowable/job/service/impl/persistence/entity/data/impl/MybatisHistoryJobDataManager.java b/.../flowable/job/service/impl/persistence/entity/data/impl/MybatisHistoryJobDataManager.java
@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.flowable.common.engine.impl.Direction;
 import org.flowable.common.engine.impl.Page;
 import org.flowable.common.engine.impl.cfg.IdGenerator;
 import org.flowable.common.engine.impl.db.AbstractDataManager;

diff --git a/pom.xml b/pom.xml
@@ -14,22 +14,22 @@
 		<distributionManagementSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</distributionManagementSnapshotsUrl>
 		<jdk.version>17</jdk.version>
 		<!-- When updating one spring version, make sure that all of them are updated to their latest compatible versions -->
-		<spring.boot.version>3.0.5</spring.boot.version>
-		<spring.framework.version>6.0.8</spring.framework.version>
+		<spring.boot.version>3.0.7</spring.boot.version>
+		<spring.framework.version>6.0.9</spring.framework.version>
 		<spring.security.version>6.0.3</spring.security.version>
 		<spring.amqp.version>3.0.3</spring.amqp.version>
 		<spring.kafka.version>3.0.5</spring.kafka.version>
 		<reactor-netty.version>1.1.6</reactor-netty.version>
-		<jackson.version>2.14.2</jackson.version>
+		<jackson.version>2.14.3</jackson.version>
 		<jakarta-jms.version>3.1.0</jakarta-jms.version>
         <camel.version>3.19.0</camel.version>
 		<cxf.version>3.5.4</cxf.version>
 		<slf4j.version>2.0.7</slf4j.version>
-		<groovy.version>4.0.10</groovy.version>
+		<groovy.version>4.0.12</groovy.version>
 		<jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
 
 		<junit.version>4.13.2</junit.version>
-		<junit.jupiter.version>5.9.2</junit.jupiter.version>
+		<junit.jupiter.version>5.9.3</junit.jupiter.version>
 		<hikari.version>4.0.3</hikari.version>
 		<maven.deploy.plugin.version>3.0.0</maven.deploy.plugin.version>
 		<maven.resources.plugin.version>3.3.0</maven.resources.plugin.version>