GEODE-10201: Bump spring from 5.3.16 to 5.3.18 (apache#7524)

* GEODE-10201: Bump spring dependency versions Geode endeavors to update to the latest version of 3rd-party dependencies on develop wherever possible. Doing so increases the shelf life of releases and increases security and reliability. Doing so regularly makes the occasional hiccups this can cause easier to pinpoint and address. Dependency bumps in this batch: * Bump spring from 5.3.16 to 5.3.18 * Bump spring-boot-starter from 2.6.4 to 2.6.5
ringles · Mar 31, 2022 · 6496160 · 6496160
1 parent cebf1f4
commit 6496160
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -695,72 +695,72 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aspects</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-oxm</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
-        <version>5.3.16</version>
+        <version>5.3.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jetty</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.session</groupId>

diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -49,7 +49,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("jackson.databind.version", "2.13.2.1")
     deps.put("jackson.bom.version", "2.13.2.20220324")
     deps.put("springshell.version", "1.2.0.RELEASE")
-    deps.put("springframework.version", "5.3.16")
+    deps.put("springframework.version", "5.3.18")
 
     // These version numbers are used in testing various versions of tomcat and are consumed explicitly
     // in will be called explicitly in the relevant extensions module, and respective configurations
@@ -288,7 +288,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-webmvc')
     }
 
-    dependencySet(group: 'org.springframework.boot', version: '2.6.4') {
+    dependencySet(group: 'org.springframework.boot', version: '2.6.5') {
       entry('spring-boot-starter')
       entry('spring-boot-starter-jetty')
       entry('spring-boot-starter-web')

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1054,12 +1054,12 @@ lib/shiro-event-1.8.0.jar
 lib/shiro-lang-1.8.0.jar
 lib/slf4j-api-1.7.32.jar
 lib/snappy-0.4.jar
-lib/spring-beans-5.3.16.jar
-lib/spring-context-5.3.16.jar
-lib/spring-core-5.3.16.jar
-lib/spring-jcl-5.3.16.jar
+lib/spring-beans-5.3.18.jar
+lib/spring-context-5.3.18.jar
+lib/spring-core-5.3.18.jar
+lib/spring-jcl-5.3.18.jar
 lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-5.3.16.jar
+lib/spring-web-5.3.18.jar
 lib/swagger-annotations-1.6.2.jar
 tools/Extensions/geode-web-0.0.0.war
 tools/Extensions/geode-web-api-0.0.0.war

diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
@@ -18,7 +18,7 @@ geode-common-0.0.0.jar
 geode-unsafe-0.0.0.jar
 geode-deployment-legacy-0.0.0.jar
 spring-shell-1.2.0.RELEASE.jar
-spring-web-5.3.16.jar
+spring-web-5.3.18.jar
 commons-lang3-3.12.0.jar
 rmiio-2.1.2.jar
 jackson-annotations-2.13.2.jar
@@ -31,8 +31,8 @@ log4j-core-2.17.2.jar
 log4j-jcl-2.17.2.jar
 log4j-jul-2.17.2.jar
 log4j-api-2.17.2.jar
-spring-context-5.3.16.jar
-spring-core-5.3.16.jar
+spring-context-5.3.18.jar
+spring-core-5.3.18.jar
 lucene-analyzers-phonetic-6.6.6.jar
 lucene-analyzers-common-6.6.6.jar
 lucene-queryparser-6.6.6.jar
@@ -74,11 +74,11 @@ shiro-event-1.8.0.jar
 shiro-crypto-core-1.8.0.jar
 shiro-lang-1.8.0.jar
 slf4j-api-1.7.32.jar
-spring-beans-5.3.16.jar
+spring-beans-5.3.18.jar
 javax.activation-api-1.2.0.jar
 jline-2.12.jar
 lucene-queries-6.6.6.jar
-spring-jcl-5.3.16.jar
+spring-jcl-5.3.18.jar
 HdrHistogram-2.1.12.jar
 LatencyUtils-2.0.3.jar
 javax.transaction-api-1.3.jar

diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
@@ -1,11 +1,11 @@
-spring-web-5.3.16.jar
+spring-web-5.3.18.jar
 shiro-event-1.8.0.jar
 shiro-crypto-hash-1.8.0.jar
 shiro-crypto-cipher-1.8.0.jar
 shiro-config-core-1.8.0.jar
 commons-digester-2.1.jar
 commons-validator-1.7.jar
-spring-jcl-5.3.16.jar
+spring-jcl-5.3.18.jar
 commons-codec-1.15.jar
 classgraph-4.8.141.jar
 jackson-databind-2.13.2.1.jar
@@ -17,15 +17,15 @@ javax.resource-api-1.7.1.jar
 LatencyUtils-2.0.3.jar
 jline-2.12.jar
 jetty-servlet-9.4.45.v20220203.jar
-spring-core-5.3.16.jar
+spring-core-5.3.18.jar
 jetty-util-ajax-9.4.45.v20220203.jar
 geode-cq-0.0.0.jar
 geode-old-client-support-0.0.0.jar
 javax.servlet-api-3.1.0.jar
 jgroups-3.6.14.Final.jar
 shiro-cache-1.8.0.jar
 httpcore-4.4.15.jar
-spring-beans-5.3.16.jar
+spring-beans-5.3.18.jar
 lucene-queries-6.6.6.jar
 shiro-core-1.8.0.jar
 HikariCP-4.0.3.jar
@@ -76,7 +76,7 @@ micrometer-core-1.8.3.jar
 shiro-config-ogdl-1.8.0.jar
 geode-log4j-0.0.0.jar
 lucene-analyzers-phonetic-6.6.6.jar
-spring-context-5.3.16.jar
+spring-context-5.3.18.jar
 jetty-security-9.4.45.v20220203.jar
 geode-logging-0.0.0.jar
 commons-io-2.11.0.jar