Skip to content

Commit b8fe368

Browse files
filiphrfiliphr
committed
Dependency upgrades
* Use Maven Wrapper from the Maven Project * Spring Boot 3.3.4 * Spring Framework 6.1.13 * Spring Security 6.3.3 * Spring AMQP 3.1.7 * Spring Kafka 3.2.4 * Spring LDAP 3.2.6 * Reactor Netty 1.1.22 * Jackson 2.17.2 * Camel 4.8.0 * CXF 4.0.5 * Groovy 4.0.23 * JUnit Jupiter 5.10.3 * Hikari 5.1.0 * Mockito 5.11.0 * Byte Buddy 1.14.19 * Artemis 2.33.0 * Apache Commons Lang3 3.17.0 * Commons IO 2.17.0 * Commons Codec 1.17.1 * Apache Http Client 5 5.3.1 * Jakarta XML Bind API 4.0.2 * Galssfish Jaxb 4.0.5 * Eclipse Angus Mail 2.0.3 * MariaDB Java Client 3.3.3 * MyBatis 3.15.16 * PostgreSQL 42.7.4 * Joda Time 2.13.0 * MSQL JDBC 12.6.4.jre11 * AssertJ 3.25.3 * JsonUnit 3.4.1 * Maven Compiler Plugin 3.13.0 * Maven Surefire Plugin 3.5.0 * Maven Jar Plugin 3.4.2 * Maven Javadoc Plugin 3.10.1 * Maven GPG Plugin 3.2.7 * Maven Install Plugin 3.1.3 * Maven Source Plugin 3.3.1 * Maven Release Plugin 3.1.1 * Exec Maven Plugin 3.4.1 * Liquibase Maven Plugin 4.29.2 * Jacoco Maven Plugin 0.8.12 * Adjust KafkaChannelDefinitionProcessor with changes from Spring Kafka 3.2.x * Update notice.txt * Remove not used dependencies from dependency management (xml-api:xml-apis, org.mybatis:mybatis-spring, com.google.guava:guava, xerces:xercesImpl)
1 parent 0c95ab1 commit b8fe368

12 files changed

Lines changed: 462 additions & 675 deletions

File tree

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

‎distro/src/notice.txt‎

Lines changed: 53 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -68,69 +68,59 @@ Quartz
6868

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

71-
aopalliance aopalliance 1.0 Public Domain
72-
com.fasterxml.jackson.core jackson-annotations 2.15.3 The Apache Software License, Version 2.0
73-
com.fasterxml.jackson.core jackson-core 2.15.3 The Apache Software License, Version 2.0
74-
com.fasterxml.jackson.core jackson-databind 2.15.3 The Apache Software License, Version 2.0
75-
com.fasterxml.jackson.datatype jackson-datatype-joda 2.15.3 The Apache Software License, Version 2.0
76-
com.google.guava guava 31.0.1-jre The Apache Software License, Version 2.0
77-
com.h2database h2 2.1.214 The H2 License, Version 1.0
78-
com.fasterxml.uuid java-uuid-generator 3.3.0 The Apache Software License, Version 2.0
79-
commons-beanutils commons-beanutils 1.8.3 The Apache Software License, Version 2.0
80-
commons-codec commons-codec 1.15 Apache License, Version 2.0
81-
commons-digester commons-digester 1.8 The Apache Software License, Version 2.0
82-
commons-collections commons-collections 3.2.2 The Apache Software License, Version 2.0
83-
commons-io commons-io 2.8.0 The Apache Software License, Version 2.0
84-
commons-pool commons-pool 1.5.4 The Apache Software License, Version 2.0
85-
commons-validator commons-validator 1.4.0 The Apache Software License, Version 2.0
86-
de.odysseus.juel juel-api 2.2.7 The Apache Software License, Version 2.0
87-
de.odysseus.juel juel-impl 2.2.7 The Apache Software License, Version 2.0
88-
de.odysseus.juel juel-spi 2.2.7 The Apache Software License, Version 2.0
89-
io.swagger swagger-annotations 1.6.2 Apache License 2.0
90-
io.swagger swagger-models 1.6.2 Apache License 2.0
91-
jakarta.activation jakarta.activation-api 2.1.2 EDL 1.0
92-
jakarta.mail jakarta.mail.api 2.1.2 EDL 1.0
93-
joda-time joda-time 2.10.13 Apache 2
94-
log4j log4j 1.2.17 The Apache Software License, Version 2.0
95-
org.apache.commons commons-lang3 3.12.0 The Apache Software License, Version 2.0
96-
org.apache.httpcomponents httpclient 4.5.13 Apache License, Version 2.0
97-
org.apache.httpcomponents httpcore 4.4.15 Apache License, Version 2.0
98-
org.apache.httpcomponents httpmime 4.5.13 Apache License, Version 2.0
99-
org.apache.geronimo.bundles json 20090211_1 The Apache Software License, Version 2.0
100-
org.apache.groovy groovy 4.0.17 The Apache Software License, Version 2.0
101-
org.apache.groovy groovy-jsr223 4.0.17 The Apache Software License, Version 2.0
102-
org.eclipse.angus angus-mail 2.0.2 EDL 1.0 / EPL 2.0
103-
org.mybatis mybatis 3.5.13 The Apache Software License, Version 2.0
104-
org.mybatis mybatis-spring 3.0.3 The Apache Software License, Version 2.0
105-
org.mvel mvel2 2.2.6.Final The Apache Software License, Version 2.0
106-
org.slf4j jcl-over-slf4j 2.0.11 MIT License
107-
org.slf4j slf4j-api 2.0.11 MIT License
108-
org.slf4j slf4j-log4j12 2.0.11 MIT License
109-
org.springframework spring-beans 6.1.3 The Apache Software License, Version 2.0
110-
org.springframework spring-core 6.1.3 The Apache Software License, Version 2.0
111-
org.springframework spring-context 6.1.3 The Apache Software License, Version 2.0
112-
org.springframework spring-context-support 6.1.3 The Apache Software License, Version 2.0
113-
org.springframework spring-jdbc 6.1.3 The Apache Software License, Version 2.0
114-
org.springframework spring-tx 6.1.3 The Apache Software License, Version 2.0
115-
org.springframework spring-web 6.1.3 The Apache Software License, Version 2.0
116-
org.springframework spring-webmvc 6.1.3 The Apache Software License, Version 2.0
117-
org.springframework spring-aop 6.1.3 The Apache Software License, Version 2.0
118-
org.springframework spring-core 6.1.3 The Apache Software License, Version 2.0
119-
org.springframework spring-expression 6.1.3 The Apache Software License, Version 2.0
120-
org.springframework spring-orm 6.1.3 The Apache Software License, Version 2.0
121-
org.springframework.security spring-security-config 6.2.1 The Apache Software License, Version 2.0
122-
org.springframework.security spring-security-core 6.2.1 The Apache Software License, Version 2.0
123-
org.springframework.security spring-security-crypto 6.2.1 The Apache Software License, Version 2.0
124-
org.springframework.security spring-security-web 6.2.1 The Apache Software License, Version 2.0
125-
org.tinyjee.jgraphx jgraphx 1.10.4.1 JGraph Ltd - 3 clause BSD license
126-
org.yaml snakeyaml 1.17 The Apache Software License, Version 2.0
127-
xerces xercesImpl 2.12.1 The Apache Software License, Version 2.0
128-
xml-apis xml-apis 1.4.01 The Apache Software License, Version 2.0-The SAX License-The W3C License
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
75+
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
77+
com.fasterxml.uuid java-uuid-generator 5.1.0 The Apache Software License, Version 2.0
78+
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
80+
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
82+
de.odysseus.juel juel-api 2.2.7 The Apache Software License, Version 2.0
83+
de.odysseus.juel juel-impl 2.2.7 The Apache Software License, Version 2.0
84+
de.odysseus.juel juel-spi 2.2.7 The Apache Software License, Version 2.0
85+
io.swagger swagger-annotations 1.6.2 Apache License 2.0
86+
io.swagger swagger-models 1.6.2 Apache License 2.0
87+
jakarta.activation jakarta.activation-api 2.1.3 EDL 1.0
88+
jakarta.mail jakarta.mail.api 2.1.3 EDL 1.0
89+
joda-time joda-time 2.13.0 Apache 2
90+
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
96+
org.eclipse.angus angus-activation 2.0.2 EDL 1.0 / EPL 2.0
97+
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
118+
org.yaml snakeyaml 2.2 The Apache Software License, Version 2.0
129119

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

132-
org.eclipse.angus angus-mail 2.0.2 EPL 2.0, GPL with classpath exception
133-
jakarta.annotation jakarta.annotation-api 2.1.1 EPL 2.0, GPL with classpath exception
134-
jakarta.jms jakarta.jms-api 3.1.0 EPL 2.0, GPL with classpath exception
135-
jakarta.mail jakarta.mail-api 2.1.2 EPL 2.0, GPL with classpath exception
136-
org.openjdk.nashorn nashorn-core 15.4 GPL with classpath exception
122+
com.zaxxer HikariCP 5.1.0 The Apache Software License, Version 2.0
123+
jakarta.annotation jakarta.annotation-api 2.1.1 EPL 2.0, GPL with classpath exception
124+
jakarta.jms jakarta.jms-api 3.1.0 EPL 2.0, GPL with classpath exception
125+
jakarta.mail jakarta.mail-api 2.1.3 EPL 2.0, GPL with classpath exception
126+
org.openjdk.nashorn nashorn-core 15.4 GPL with classpath exception

‎modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationSecurityTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ public class FlowableRestApplicationSecurityTest {
7272
"caches",
7373
"caches-cache",
7474
"health-path",
75-
"configprops-prefix"
75+
"configprops-prefix",
76+
"sbom",
77+
"sbom-id"
7678
)
7779
);
7880

0 commit comments

Comments
 (0)