Skip to content

Commit 5248b9c

Browse files
dbmalkovskydbmalkovsky
authored
Upgrade Spring Framework/Security/Boot (#3158)
1 parent 2fcddbf commit 5248b9c

8 files changed

Lines changed: 38 additions & 44 deletions

File tree

‎distro/src/notice.txt‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ Quartz
9696
This software includes unchanged copies of the following libraries:
9797

9898
aopalliance aopalliance 1.0 Public Domain
99-
com.fasterxml.jackson.core jackson-annotations 2.12.3 The Apache Software License, Version 2.0
100-
com.fasterxml.jackson.core jackson-core 2.12.3 The Apache Software License, Version 2.0
101-
com.fasterxml.jackson.core jackson-databind 2.12.3 The Apache Software License, Version 2.0
102-
com.fasterxml.jackson.datatype jackson-datatype-joda 2.12.3 The Apache Software License, Version 2.0
99+
com.fasterxml.jackson.core jackson-annotations 2.13.1 The Apache Software License, Version 2.0
100+
com.fasterxml.jackson.core jackson-core 2.13.1 The Apache Software License, Version 2.0
101+
com.fasterxml.jackson.core jackson-databind 2.13.1 The Apache Software License, Version 2.0
102+
com.fasterxml.jackson.datatype jackson-datatype-joda 2.13.1 The Apache Software License, Version 2.0
103103
com.google.guava guava 30.1-jre The Apache Software License, Version 2.0
104104
com.h2database h2 1.4.200 The H2 License, Version 1.0
105105
com.fasterxml.uuid java-uuid-generator 3.3.0 The Apache Software License, Version 2.0
@@ -124,34 +124,34 @@ log4j log4j 1.2.17 The
124124
org.apache.commons commons-email 1.5 Apache License, Version 2.0
125125
org.apache.commons commons-lang3 3.12.0 The Apache Software License, Version 2.0
126126
org.apache.httpcomponents httpclient 4.5.13 Apache License, Version 2.0
127-
org.apache.httpcomponents httpcore 4.4.14 Apache License, Version 2.0
127+
org.apache.httpcomponents httpcore 4.4.15 Apache License, Version 2.0
128128
org.apache.httpcomponents httpmime 4.5.13 Apache License, Version 2.0
129129
org.apache.geronimo.bundles json 20090211_1 The Apache Software License, Version 2.0
130-
org.codehaus.groovy groovy 3.0.8 The Apache Software License, Version 2.0
131-
org.codehaus.groovy groovy-jsr223 3.0.8 The Apache Software License, Version 2.0
132-
org.liquibase liquibase-core 4.3.5 Apache License, Version 2.0
130+
org.codehaus.groovy groovy 3.0.9 The Apache Software License, Version 2.0
131+
org.codehaus.groovy groovy-jsr223 3.0.9 The Apache Software License, Version 2.0
132+
org.liquibase liquibase-core 4.5.0 Apache License, Version 2.0
133133
org.mybatis mybatis 3.5.7 The Apache Software License, Version 2.0
134134
org.mybatis mybatis-spring 2.0.6 The Apache Software License, Version 2.0
135135
org.mvel mvel2 2.2.6.Final The Apache Software License, Version 2.0
136136
org.slf4j jcl-over-slf4j 1.7.32 MIT License
137137
org.slf4j slf4j-api 1.7.32 MIT License
138138
org.slf4j slf4j-log4j12 1.7.32 MIT License
139-
org.springframework spring-beans 5.3.13 The Apache Software License, Version 2.0
140-
org.springframework spring-core 5.3.13 The Apache Software License, Version 2.0
141-
org.springframework spring-context 5.3.13 The Apache Software License, Version 2.0
142-
org.springframework spring-context-support 5.3.13 The Apache Software License, Version 2.0
143-
org.springframework spring-jdbc 5.3.13 The Apache Software License, Version 2.0
144-
org.springframework spring-tx 5.3.13 The Apache Software License, Version 2.0
145-
org.springframework spring-web 5.3.13 The Apache Software License, Version 2.0
146-
org.springframework spring-webmvc 5.3.13 The Apache Software License, Version 2.0
147-
org.springframework spring-aop 5.3.13 The Apache Software License, Version 2.0
148-
org.springframework spring-core 5.3.13 The Apache Software License, Version 2.0
149-
org.springframework spring-expression 5.3.13 The Apache Software License, Version 2.0
150-
org.springframework spring-orm 5.3.13 The Apache Software License, Version 2.0
151-
org.springframework.security spring-security-config 5.5.3 The Apache Software License, Version 2.0
152-
org.springframework.security spring-security-core 5.5.3 The Apache Software License, Version 2.0
153-
org.springframework.security spring-security-crypto 5.5.3 The Apache Software License, Version 2.0
154-
org.springframework.security spring-security-web 5.5.3 The Apache Software License, Version 2.0
139+
org.springframework spring-beans 5.3.14 The Apache Software License, Version 2.0
140+
org.springframework spring-core 5.3.14 The Apache Software License, Version 2.0
141+
org.springframework spring-context 5.3.14 The Apache Software License, Version 2.0
142+
org.springframework spring-context-support 5.3.14 The Apache Software License, Version 2.0
143+
org.springframework spring-jdbc 5.3.14 The Apache Software License, Version 2.0
144+
org.springframework spring-tx 5.3.14 The Apache Software License, Version 2.0
145+
org.springframework spring-web 5.3.14 The Apache Software License, Version 2.0
146+
org.springframework spring-webmvc 5.3.14 The Apache Software License, Version 2.0
147+
org.springframework spring-aop 5.3.14 The Apache Software License, Version 2.0
148+
org.springframework spring-core 5.3.14 The Apache Software License, Version 2.0
149+
org.springframework spring-expression 5.3.14 The Apache Software License, Version 2.0
150+
org.springframework spring-orm 5.3.14 The Apache Software License, Version 2.0
151+
org.springframework.security spring-security-config 5.6.1 The Apache Software License, Version 2.0
152+
org.springframework.security spring-security-core 5.6.1 The Apache Software License, Version 2.0
153+
org.springframework.security spring-security-crypto 5.6.1 The Apache Software License, Version 2.0
154+
org.springframework.security spring-security-web 5.6.1 The Apache Software License, Version 2.0
155155
org.tinyjee.jgraphx jgraphx 1.10.4.1 JGraph Ltd - 3 clause BSD license
156156
org.yaml snakeyaml 1.17 The Apache Software License, Version 2.0
157157
xerces xercesImpl 2.12.1 The Apache Software License, Version 2.0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public void contextShouldLoadPropertiesInACorrectOrder() {
3737
.containsExactly(
3838
"configurationProperties",
3939
"Inlined Test Properties",
40-
"test",
4140
"servletConfigInitParams",
4241
"servletContextInitParams",
4342
"systemProperties",

‎modules/flowable-ui/flowable-ui-app/src/test/java/org/flowable/ui/application/FlowableUiApplicationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void contextShouldLoad() {
4949
.containsExactly(
5050
"configurationProperties",
5151
"Inlined Test Properties",
52-
"test",
5352
"servletConfigInitParams",
5453
"servletContextInitParams",
5554
"systemProperties",

‎modules/flowable-ui/flowable-ui-app/src/test/java/org/flowable/ui/application/FlowableUiApplicationWithEnabledJmsKafkaAndRabbitTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void contextShouldLoad() {
5353
.containsExactly(
5454
"configurationProperties",
5555
"Inlined Test Properties",
56-
"test",
5756
"servletConfigInitParams",
5857
"servletContextInitParams",
5958
"systemProperties",

‎modules/flowable-ui/flowable-ui-app/src/test/java/org/flowable/ui/application/FlowableUiApplicationWithEnabledJmsTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void contextShouldLoad() {
4949
.containsExactly(
5050
"configurationProperties",
5151
"Inlined Test Properties",
52-
"test",
5352
"servletConfigInitParams",
5453
"servletContextInitParams",
5554
"systemProperties",

‎modules/flowable-ui/flowable-ui-app/src/test/java/org/flowable/ui/application/FlowableUiApplicationWithEnabledKafkaTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void contextShouldLoad() {
4949
.containsExactly(
5050
"configurationProperties",
5151
"Inlined Test Properties",
52-
"test",
5352
"servletConfigInitParams",
5453
"servletContextInitParams",
5554
"systemProperties",

‎modules/flowable-ui/flowable-ui-app/src/test/java/org/flowable/ui/application/FlowableUiApplicationWithEnabledRabbitTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void contextShouldLoad() {
4949
.containsExactly(
5050
"configurationProperties",
5151
"Inlined Test Properties",
52-
"test",
5352
"servletConfigInitParams",
5453
"servletContextInitParams",
5554
"systemProperties",

‎pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<distributionManagementSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</distributionManagementSnapshotsUrl>
1515
<jdk.version>1.8</jdk.version>
1616
<!-- When updating one spring version, make sure that all of them are updated to their latest compatible versions -->
17-
<spring.boot.version>2.5.7</spring.boot.version>
18-
<spring.framework.version>5.3.13</spring.framework.version>
19-
<spring.security.version>5.5.3</spring.security.version>
20-
<spring.amqp.version>2.3.12</spring.amqp.version>
21-
<spring.kafka.version>2.7.9</spring.kafka.version>
22-
<reactor-netty.version>1.0.6</reactor-netty.version>
23-
<jackson.version>2.12.5</jackson.version>
17+
<spring.boot.version>2.6.2</spring.boot.version>
18+
<spring.framework.version>5.3.14</spring.framework.version>
19+
<spring.security.version>5.6.1</spring.security.version>
20+
<spring.amqp.version>2.4.1</spring.amqp.version>
21+
<spring.kafka.version>2.8.1</spring.kafka.version>
22+
<reactor-netty.version>1.0.14</reactor-netty.version>
23+
<jackson.version>2.13.1</jackson.version>
2424
<jakarta-jms.version>2.0.3</jakarta-jms.version>
2525
<mule.version>3.8.0</mule.version>
2626
<camel.version>2.25.0</camel.version>
@@ -30,11 +30,11 @@
3030
<jib-maven-plugin.version>2.6.0</jib-maven-plugin.version>
3131

3232
<junit.version>4.13.2</junit.version>
33-
<junit.jupiter.version>5.7.2</junit.jupiter.version>
33+
<junit.jupiter.version>5.8.2</junit.jupiter.version>
3434
<hikari.version>3.4.5</hikari.version>
3535
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
3636
<maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
37-
<mockito.version>3.12.2</mockito.version>
37+
<mockito.version>4.0.0</mockito.version>
3838
<testcontainers.version>1.12.4</testcontainers.version>
3939

4040
<oracle.jdbc.version>12.2.0.1</oracle.jdbc.version>
@@ -132,7 +132,7 @@
132132
<dependency>
133133
<groupId>org.apache.httpcomponents</groupId>
134134
<artifactId>httpcore</artifactId>
135-
<version>4.4.14</version>
135+
<version>4.4.15</version>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.apache.httpcomponents</groupId>
@@ -232,7 +232,7 @@
232232
<dependency>
233233
<groupId>com.ibm.db2</groupId>
234234
<artifactId>jcc</artifactId>
235-
<version>11.5.6.0</version>
235+
<version>11.5.7.0</version>
236236
</dependency>
237237
<dependency>
238238
<groupId>org.flowable</groupId>
@@ -790,7 +790,7 @@
790790
<dependency>
791791
<groupId>org.hibernate</groupId>
792792
<artifactId>hibernate-core</artifactId>
793-
<version>5.4.32.Final</version>
793+
<version>5.6.3.Final</version>
794794
</dependency>
795795
<dependency>
796796
<groupId>org.codehaus.groovy</groupId>
@@ -993,7 +993,7 @@
993993
<dependency>
994994
<groupId>org.liquibase</groupId>
995995
<artifactId>liquibase-core</artifactId>
996-
<version>4.3.5</version>
996+
<version>4.5.0</version>
997997
<exclusions>
998998
<exclusion>
999999
<groupId>javax.xml.bind</groupId>
@@ -1010,7 +1010,7 @@
10101010
<dependency>
10111011
<groupId>org.postgresql</groupId>
10121012
<artifactId>postgresql</artifactId>
1013-
<version>42.2.22</version>
1013+
<version>42.3.0</version>
10141014
</dependency>
10151015
<dependency>
10161016
<groupId>xerces</groupId>

0 commit comments

Comments
 (0)