Skip to content

Commit 3f9a357

Browse files
jbarrezjbarrez
committed
Merge branch 'main' into flowable-release-7.3.0
2 parents 1f3938d + 688e2f8 commit 3f9a357

179 files changed

Lines changed: 1954 additions & 379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/oracle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
serviceName: XEPDB1
3232
type: xe
3333
- oracle: 23-slim-faststart
34-
driverVersion: 23.5.0.24.07
35-
driverArtifact: ojdbc11
34+
driverVersion: 23.7.0.25.01
35+
driverArtifact: ojdbc17
3636
serviceName: FREEPDB1
3737
type: free
3838
services:

‎distro/src/notice.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ Quartz
6868

6969
This software includes unchanged copies of the following libraries:
7070

71-
com.fasterxml.jackson.core jackson-annotations 2.17.2 The Apache Software License, Version 2.0
72-
com.fasterxml.jackson.core jackson-core 2.17.2 The Apache Software License, Version 2.0
73-
com.fasterxml.jackson.core jackson-databind 2.17.2 The Apache Software License, Version 2.0
74-
com.fasterxml.jackson.datatype jackson-datatype-joda 2.17.2 The Apache Software License, Version 2.0
71+
com.fasterxml.jackson.core jackson-annotations 2.19.0 The Apache Software License, Version 2.0
72+
com.fasterxml.jackson.core jackson-core 2.19.0 The Apache Software License, Version 2.0
73+
com.fasterxml.jackson.core jackson-databind 2.19.0 The Apache Software License, Version 2.0
74+
com.fasterxml.jackson.datatype jackson-datatype-joda 2.19.0 The Apache Software License, Version 2.0
7575
com.github.vlsi.mxgraph jgraphx 4.2.2 JGraph Ltd - 3 clause BSD license
76-
com.h2database h2 2.2.224 The H2 License, Version 1.0
76+
com.h2database h2 2.3.232 The H2 License, Version 1.0
7777
com.fasterxml.uuid java-uuid-generator 5.1.0 The Apache Software License, Version 2.0
7878
commons-beanutils commons-beanutils 1.9.4 The Apache Software License, Version 2.0
79-
commons-codec commons-codec 1.17.1 Apache License, Version 2.0
79+
commons-codec commons-codec 1.18.0 Apache License, Version 2.0
8080
commons-collections commons-collections 3.2.2 The Apache Software License, Version 2.0
81-
commons-io commons-io 2.17.0 The Apache Software License, Version 2.0
81+
commons-io commons-io 2.19.0 The Apache Software License, Version 2.0
8282
de.odysseus.juel juel-api 2.2.7 The Apache Software License, Version 2.0
8383
de.odysseus.juel juel-impl 2.2.7 The Apache Software License, Version 2.0
8484
de.odysseus.juel juel-spi 2.2.7 The Apache Software License, Version 2.0
@@ -88,38 +88,38 @@ jakarta.activation jakarta.activation-api 2.1.3 ED
8888
jakarta.mail jakarta.mail.api 2.1.3 EDL 1.0
8989
joda-time joda-time 2.13.0 Apache 2
9090
org.apache.commons commons-lang3 3.17.0 The Apache Software License, Version 2.0
91-
org.apache.httpcomponents.client5 httpclient5 5.2.5 Apache License, Version 2.0
92-
org.apache.httpcomponents.core5 httpcore5 5.2.5 Apache License, Version 2.0
93-
org.apache.httpcomponents.core5 httpcore5-h2 5.2.5 Apache License, Version 2.0
94-
org.apache.groovy groovy 4.0.23 The Apache Software License, Version 2.0
95-
org.apache.groovy groovy-jsr223 4.0.23 The Apache Software License, Version 2.0
91+
org.apache.httpcomponents.client5 httpclient5 5.4.4 Apache License, Version 2.0
92+
org.apache.httpcomponents.core5 httpcore5 5.4.4 Apache License, Version 2.0
93+
org.apache.httpcomponents.core5 httpcore5-h2 5.4.4 Apache License, Version 2.0
94+
org.apache.groovy groovy 4.0.26 The Apache Software License, Version 2.0
95+
org.apache.groovy groovy-jsr223 4.0.26 The Apache Software License, Version 2.0
9696
org.eclipse.angus angus-activation 2.0.2 EDL 1.0 / EPL 2.0
9797
org.eclipse.angus angus-mail 2.0.3 EDL 1.0 / EPL 2.0
98-
org.mybatis mybatis 3.5.16 The Apache Software License, Version 2.0
99-
org.slf4j jcl-over-slf4j 2.0.16 MIT License
100-
org.slf4j slf4j-api 2.0.16 MIT License
101-
org.slf4j slf4j-log4j12 2.0.16 MIT License
102-
org.springframework spring-beans 6.1.13 The Apache Software License, Version 2.0
103-
org.springframework spring-core 6.1.13 The Apache Software License, Version 2.0
104-
org.springframework spring-context 6.1.13 The Apache Software License, Version 2.0
105-
org.springframework spring-jdbc 6.1.13 The Apache Software License, Version 2.0
106-
org.springframework spring-tx 6.1.13 The Apache Software License, Version 2.0
107-
org.springframework spring-web 6.1.13 The Apache Software License, Version 2.0
108-
org.springframework spring-webmvc 6.1.13 The Apache Software License, Version 2.0
109-
org.springframework spring-aop 6.1.13 The Apache Software License, Version 2.0
110-
org.springframework spring-core 6.1.13 The Apache Software License, Version 2.0
111-
org.springframework spring-expression 6.1.13 The Apache Software License, Version 2.0
112-
org.springframework spring-orm 6.1.13 The Apache Software License, Version 2.0
113-
org.springframework.security spring-security-config 6.3.3 The Apache Software License, Version 2.0
114-
org.springframework.security spring-security-core 6.3.3 The Apache Software License, Version 2.0
115-
org.springframework.security spring-security-crypto 6.3.3 The Apache Software License, Version 2.0
116-
org.springframework.security spring-security-web 6.3.3 The Apache Software License, Version 2.0
117-
org.springframework.security spring-security-ldap 6.3.3 The Apache Software License, Version 2.0
98+
org.mybatis mybatis 3.5.19 The Apache Software License, Version 2.0
99+
org.slf4j jcl-over-slf4j 2.0.17 MIT License
100+
org.slf4j slf4j-api 2.0.17 MIT License
101+
org.slf4j slf4j-reload4j 2.0.17 MIT License
102+
org.springframework spring-beans 6.2.7 The Apache Software License, Version 2.0
103+
org.springframework spring-core 6.2.7 The Apache Software License, Version 2.0
104+
org.springframework spring-context 6.2.7 The Apache Software License, Version 2.0
105+
org.springframework spring-jdbc 6.2.7 The Apache Software License, Version 2.0
106+
org.springframework spring-tx 6.2.7 The Apache Software License, Version 2.0
107+
org.springframework spring-web 6.2.7 The Apache Software License, Version 2.0
108+
org.springframework spring-webmvc 6.2.7 The Apache Software License, Version 2.0
109+
org.springframework spring-aop 6.2.7 The Apache Software License, Version 2.0
110+
org.springframework spring-core 6.2.7 The Apache Software License, Version 2.0
111+
org.springframework spring-expression 6.2.7 The Apache Software License, Version 2.0
112+
org.springframework spring-orm 6.2.7 The Apache Software License, Version 2.0
113+
org.springframework.security spring-security-config 6.5.0 The Apache Software License, Version 2.0
114+
org.springframework.security spring-security-core 6.5.0 The Apache Software License, Version 2.0
115+
org.springframework.security spring-security-crypto 6.5.0 The Apache Software License, Version 2.0
116+
org.springframework.security spring-security-web 6.5.0 The Apache Software License, Version 2.0
117+
org.springframework.security spring-security-ldap 6.5.0 The Apache Software License, Version 2.0
118118
org.yaml snakeyaml 2.2 The Apache Software License, Version 2.0
119119

120120
When using the Flowable Rest app, there are a number of additional libraries included, which are otherwise not a dependency of Flowable:
121121

122-
com.zaxxer HikariCP 5.1.0 The Apache Software License, Version 2.0
122+
com.zaxxer HikariCP 6.3.0 The Apache Software License, Version 2.0
123123
jakarta.annotation jakarta.annotation-api 2.1.1 EPL 2.0, GPL with classpath exception
124124
jakarta.jms jakarta.jms-api 3.1.0 EPL 2.0, GPL with classpath exception
125125
jakarta.mail jakarta.mail-api 2.1.3 EPL 2.0, GPL with classpath exception

‎docs/docusaurus/docs/bpmn/ch02-GettingStarted.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Flowable uses [SLF4J](http://www.slf4j.org/) as its logging framework internally
141141
</dependency>
142142
<dependency>
143143
<groupId>org.slf4j</groupId>
144-
<artifactId>slf4j-log4j12</artifactId>
144+
<artifactId>slf4j-reload4j</artifactId>
145145
<version>2.0.7</version>
146146
</dependency>
147147

‎docs/docusaurus/docs/bpmn/ch03-Configuration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ With Maven, add for example a dependency like this (here using log4j), note that
404404

405405
<dependency>
406406
<groupId>org.slf4j</groupId>
407-
<artifactId>slf4j-log4j12</artifactId>
407+
<artifactId>slf4j-reload4j</artifactId>
408408
</dependency>
409409

410410
The flowable-rest webapp is configured to use Log4j-binding. Log4j is also used when running the tests for all the flowable-\* modules.

‎docs/docusaurus/docs/cmmn/ch02-Configuration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ With Maven, add for example a dependency like this (here using log4j), note that
336336

337337
<dependency>
338338
<groupId>org.slf4j</groupId>
339-
<artifactId>slf4j-log4j12</artifactId>
339+
<artifactId>slf4j-reload4j</artifactId>
340340
</dependency>
341341

342342
The flowable-rest webapp is configured to use Log4j-binding. Log4j is also used when running the tests for all the flowable-\* modules.

‎docs/docusaurus/docs/dmn/ch02-Configuration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ With Maven, for example, add a dependency like this (here using log4j), note tha
400400

401401
<dependency>
402402
<groupId>org.slf4j</groupId>
403-
<artifactId>slf4j-log4j12</artifactId>
403+
<artifactId>slf4j-reload4j</artifactId>
404404
</dependency>
405405

406406
The flowable-rest webapp is configured to use Log4j-binding. Log4j is also used when running the tests for all the flowable-\* modules.

‎docs/docusaurus/docs/eventregistry/ch02-Configuration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ With Maven, for example, add a dependency like this (here using log4j), note tha
341341

342342
<dependency>
343343
<groupId>org.slf4j</groupId>
344-
<artifactId>slf4j-log4j12</artifactId>
344+
<artifactId>slf4j-reload4j</artifactId>
345345
</dependency>
346346

347347
The flowable-rest webapp is configured to use Log4j-binding. Log4j is also used when running the tests for all the flowable-\* modules.

‎docs/public-api/tools/flowable-oas-generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
</dependency>
211211
<dependency>
212212
<groupId>org.slf4j</groupId>
213-
<artifactId>slf4j-log4j12</artifactId>
213+
<artifactId>slf4j-reload4j</artifactId>
214214
</dependency>
215215
<dependency>
216216
<groupId>org.slf4j</groupId>

‎modules/flowable-app-engine-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</dependency>
117117
<dependency>
118118
<groupId>org.slf4j</groupId>
119-
<artifactId>slf4j-log4j12</artifactId>
119+
<artifactId>slf4j-reload4j</artifactId>
120120
<scope>test</scope>
121121
</dependency>
122122

‎modules/flowable-app-engine-spring/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
</dependency>
164164
<dependency>
165165
<groupId>org.slf4j</groupId>
166-
<artifactId>slf4j-log4j12</artifactId>
166+
<artifactId>slf4j-reload4j</artifactId>
167167
<scope>test</scope>
168168
</dependency>
169169
<dependency>

0 commit comments

Comments
 (0)