GEODE-8496: Bump spring from 5.3.1 to 5.3.2 (#5873)
Bump spring from 5.3.1 to 5.3.2 EXCEPT for spring-test (spring-test 5.3.3 may fix)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 79dd821..acab8be 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -790,37 +790,37 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -832,19 +832,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>5.3.1</version>
+ <version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
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
index 83e3e36..dd6575b 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -249,19 +249,22 @@
entry('spring-security-oauth2-jose')
}
- dependencySet(group: 'org.springframework', version: '5.3.1') {
+ dependencySet(group: 'org.springframework', version: '5.3.2') {
entry('spring-aspects')
entry('spring-beans')
entry('spring-context')
entry('spring-core')
entry('spring-expression')
entry('spring-oxm')
- entry('spring-test')
entry('spring-tx')
entry('spring-web')
entry('spring-webmvc')
}
+ dependencySet(group: 'org.springframework', version: '5.3.1') {
+ entry('spring-test')
+ }
+
dependencySet(group: 'org.springframework.boot', version: '2.4.1') {
entry('spring-boot-starter')
entry('spring-boot-starter-jetty')
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 6767f07..2de258f 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1070,12 +1070,12 @@
lib/shiro-lang-1.7.0.jar
lib/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
-lib/spring-beans-5.3.1.jar
-lib/spring-context-5.3.1.jar
-lib/spring-core-5.3.1.jar
-lib/spring-jcl-5.3.1.jar
+lib/spring-beans-5.3.2.jar
+lib/spring-context-5.3.2.jar
+lib/spring-core-5.3.2.jar
+lib/spring-jcl-5.3.2.jar
lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-5.3.1.jar
+lib/spring-web-5.3.2.jar
lib/swagger-annotations-1.6.2.jar
tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.zip
tools/Extensions/geode-web-0.0.0.war
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 0676245..a256d55 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -65,13 +65,13 @@
shiro-crypto-core-1.7.0.jar
shiro-lang-1.7.0.jar
slf4j-api-1.7.30.jar
-spring-core-5.3.1.jar
+spring-core-5.3.2.jar
javax.activation-api-1.2.0.jar
jline-2.12.jar
HdrHistogram-2.1.12.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
-spring-jcl-5.3.1.jar
+spring-jcl-5.3.2.jar
jetty-http-9.4.35.v20201120.jar
jetty-io-9.4.35.v20201120.jar
jetty-xml-9.4.35.v20201120.jar
