Skip to content

Commit 2b90279

Browse files
committed
GEODE-10572: Upgrade Spring Boot to 3.3.13
1 parent 295cd4c commit 2b90279

5 files changed

Lines changed: 53 additions & 43 deletions

File tree

boms/geode-all-bom/src/test/resources/expected-pom.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,17 +715,27 @@
715715
<dependency>
716716
<groupId>org.springframework.boot</groupId>
717717
<artifactId>spring-boot-starter</artifactId>
718-
<version>2.6.7</version>
718+
<version>3.3.13</version>
719719
</dependency>
720720
<dependency>
721721
<groupId>org.springframework.boot</groupId>
722722
<artifactId>spring-boot-starter-jetty</artifactId>
723-
<version>2.6.7</version>
723+
<version>3.3.13</version>
724+
</dependency>
725+
<dependency>
726+
<groupId>org.springframework.boot</groupId>
727+
<artifactId>spring-boot-starter-validation</artifactId>
728+
<version>3.3.13</version>
724729
</dependency>
725730
<dependency>
726731
<groupId>org.springframework.boot</groupId>
727732
<artifactId>spring-boot-starter-web</artifactId>
728-
<version>2.6.7</version>
733+
<version>3.3.13</version>
734+
</dependency>
735+
<dependency>
736+
<groupId>org.springframework.boot</groupId>
737+
<artifactId>spring-boot-autoconfigure</artifactId>
738+
<version>3.3.13</version>
729739
</dependency>
730740
<dependency>
731741
<groupId>org.jetbrains</groupId>

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class DependencyConstraints {
5858
// Spring Framework 6.x Migration
5959
deps.put("springshell.version", "3.3.3")
6060
deps.put("springframework.version", "6.1.14")
61-
deps.put("springboot.version", "3.3.5")
61+
deps.put("springboot.version", "3.3.13")
6262
deps.put("springsecurity.version", "6.3.4")
6363
deps.put("springhateoas.version", "2.3.3")
6464
deps.put("springldap.version", "3.2.7")

geode-assembly/src/integrationTest/resources/assembly_content.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ lib/geode-tcp-server-0.0.0.jar
12371237
lib/geode-unsafe-0.0.0.jar
12381238
lib/geode-wan-0.0.0.jar
12391239
lib/gfsh-dependencies.jar
1240-
lib/hibernate-validator-8.0.1.Final.jar
1240+
lib/hibernate-validator-8.0.2.Final.jar
12411241
lib/httpclient5-5.4.4.jar
12421242
lib/httpcore5-5.3.4.jar
12431243
lib/httpcore5-h2-5.3.4.jar
@@ -1289,7 +1289,7 @@ lib/jna-5.11.0.jar
12891289
lib/jna-platform-5.11.0.jar
12901290
lib/joda-time-2.12.7.jar
12911291
lib/jopt-simple-5.0.4.jar
1292-
lib/jul-to-slf4j-2.0.16.jar
1292+
lib/jul-to-slf4j-2.0.17.jar
12931293
lib/log4j-api-2.25.3.jar
12941294
lib/log4j-core-2.25.3.jar
12951295
lib/log4j-jcl-2.25.3.jar
@@ -1325,16 +1325,16 @@ lib/slf4j-api-2.0.17.jar
13251325
lib/snakeyaml-2.3.jar
13261326
lib/snappy-0.5.jar
13271327
lib/spring-aop-6.1.14.jar
1328-
lib/spring-beans-6.1.14.jar
1329-
lib/spring-boot-3.3.5.jar
1330-
lib/spring-boot-autoconfigure-3.3.5.jar
1331-
lib/spring-boot-starter-3.3.5.jar
1332-
lib/spring-boot-starter-logging-3.3.5.jar
1333-
lib/spring-boot-starter-validation-3.3.5.jar
1334-
lib/spring-context-6.1.14.jar
1335-
lib/spring-core-6.1.14.jar
1336-
lib/spring-expression-6.1.14.jar
1337-
lib/spring-jcl-6.1.14.jar
1328+
lib/spring-beans-6.1.21.jar
1329+
lib/spring-boot-3.3.13.jar
1330+
lib/spring-boot-autoconfigure-3.3.13.jar
1331+
lib/spring-boot-starter-3.3.13.jar
1332+
lib/spring-boot-starter-logging-3.3.13.jar
1333+
lib/spring-boot-starter-validation-3.3.13.jar
1334+
lib/spring-context-6.1.21.jar
1335+
lib/spring-core-6.1.21.jar
1336+
lib/spring-expression-6.1.21.jar
1337+
lib/spring-jcl-6.1.21.jar
13381338
lib/spring-messaging-6.1.14.jar
13391339
lib/spring-shell-autoconfigure-3.3.3.jar
13401340
lib/spring-shell-core-3.3.3.jar
@@ -1344,7 +1344,7 @@ lib/spring-shell-starter-3.3.3.jar
13441344
lib/spring-shell-table-3.3.3.jar
13451345
lib/spring-web-6.1.14.jar
13461346
lib/swagger-annotations-2.2.22.jar
1347-
lib/tomcat-embed-el-10.1.31.jar
1347+
lib/tomcat-embed-el-10.1.42.jar
13481348
lib/txw2-4.0.2.jar
13491349
tools/Extensions/geode-web-0.0.0.war
13501350
tools/Extensions/geode-web-api-0.0.0.war

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ spring-shell-standard-commands-3.3.3.jar
4343
spring-shell-standard-3.3.3.jar
4444
spring-shell-core-3.3.3.jar
4545
spring-shell-table-3.3.3.jar
46-
spring-boot-starter-validation-3.3.5.jar
47-
spring-boot-starter-3.3.5.jar
46+
spring-boot-starter-validation-3.3.13.jar
47+
spring-boot-starter-3.3.13.jar
4848
spring-messaging-6.1.14.jar
49-
spring-boot-autoconfigure-3.3.5.jar
50-
spring-boot-3.3.5.jar
51-
spring-context-6.1.14.jar
52-
spring-beans-6.1.14.jar
53-
spring-expression-6.1.14.jar
54-
spring-core-6.1.14.jar
49+
spring-boot-autoconfigure-3.3.13.jar
50+
spring-boot-3.3.13.jar
51+
spring-context-6.1.21.jar
52+
spring-beans-6.1.21.jar
53+
spring-expression-6.1.21.jar
54+
spring-core-6.1.21.jar
5555
angus-activation-2.0.0.jar
5656
jakarta.activation-api-2.1.3.jar
5757
lucene-analysis-phonetic-9.12.3.jar
@@ -110,13 +110,13 @@ shiro-hashes-bcrypt-2.1.0.jar
110110
jetty-xml-12.0.33.jar
111111
jetty-http-12.0.33.jar
112112
jetty-io-12.0.33.jar
113-
spring-boot-starter-logging-3.3.5.jar
114-
jul-to-slf4j-2.0.16.jar
113+
spring-boot-starter-logging-3.3.13.jar
114+
jul-to-slf4j-2.0.17.jar
115115
jetty-jndi-12.0.33.jar
116116
jetty-util-12.0.33.jar
117117
slf4j-api-2.0.17.jar
118118
micrometer-observation-1.14.0.jar
119-
spring-jcl-6.1.14.jar
119+
spring-jcl-6.1.21.jar
120120
micrometer-commons-1.14.0.jar
121121
LatencyUtils-2.0.3.jar
122122
reactor-core-3.6.10.jar
@@ -134,8 +134,8 @@ asm-9.9.1.jar
134134
reactive-streams-1.0.4.jar
135135
jline-native-3.26.3.jar
136136
antlr-runtime-3.5.2.jar
137-
tomcat-embed-el-10.1.31.jar
138-
hibernate-validator-8.0.1.Final.jar
137+
tomcat-embed-el-10.1.42.jar
138+
hibernate-validator-8.0.2.Final.jar
139139
jakarta.enterprise.lang-model-4.0.1.jar
140140
jakarta.validation-api-3.0.2.jar
141141
jboss-logging-3.4.3.Final.jar

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ commons-io-2.19.0.jar
4949
micrometer-core-1.14.0.jar
5050
jakarta.resource-api-2.1.0.jar
5151
jetty-ee10-annotations-12.0.33.jar
52-
spring-boot-starter-validation-3.3.5.jar
53-
spring-boot-starter-3.3.5.jar
52+
spring-boot-starter-validation-3.3.13.jar
53+
spring-boot-starter-3.3.13.jar
5454
jetty-ee10-plus-12.0.33.jar
5555
jakarta.enterprise.cdi-api-4.0.1.jar
5656
jakarta.interceptor-api-2.1.0.jar
@@ -71,12 +71,12 @@ istack-commons-runtime-4.1.1.jar
7171
spring-web-6.1.14.jar
7272
spring-shell-table-3.3.3.jar
7373
spring-messaging-6.1.14.jar
74-
spring-boot-autoconfigure-3.3.5.jar
75-
spring-boot-3.3.5.jar
76-
spring-context-6.1.14.jar
77-
spring-beans-6.1.14.jar
78-
spring-expression-6.1.14.jar
79-
spring-core-6.1.14.jar
74+
spring-boot-autoconfigure-3.3.13.jar
75+
spring-boot-3.3.13.jar
76+
spring-context-6.1.21.jar
77+
spring-beans-6.1.21.jar
78+
spring-expression-6.1.21.jar
79+
spring-core-6.1.21.jar
8080
lucene-analysis-phonetic-9.12.3.jar
8181
lucene-analysis-common-9.12.3.jar
8282
lucene-queryparser-9.12.3.jar
@@ -110,13 +110,13 @@ jetty-http-12.0.33.jar
110110
jetty-io-12.0.33.jar
111111
jetty-jndi-12.0.33.jar
112112
jetty-util-12.0.33.jar
113-
spring-boot-starter-logging-3.3.5.jar
114-
jul-to-slf4j-2.0.16.jar
113+
spring-boot-starter-logging-3.3.13.jar
114+
jul-to-slf4j-2.0.17.jar
115115
slf4j-api-2.0.17.jar
116116
micrometer-observation-1.14.0.jar
117117
micrometer-commons-1.14.0.jar
118118
LatencyUtils-2.0.3.jar
119-
spring-jcl-6.1.14.jar
119+
spring-jcl-6.1.21.jar
120120
asm-commons-9.9.1.jar
121121
asm-tree-9.9.1.jar
122122
asm-9.9.1.jar
@@ -133,8 +133,8 @@ jakarta.enterprise.lang-model-4.0.1.jar
133133
reactive-streams-1.0.4.jar
134134
jline-native-3.26.3.jar
135135
antlr-runtime-3.5.2.jar
136-
tomcat-embed-el-10.1.31.jar
137-
hibernate-validator-8.0.1.Final.jar
136+
tomcat-embed-el-10.1.42.jar
137+
hibernate-validator-8.0.2.Final.jar
138138
jakarta.el-api-5.0.0.jar
139139
jakarta.inject-api-2.0.1.jar
140140
jakarta.validation-api-3.0.2.jar

0 commit comments

Comments
 (0)