This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push: new d6564a2 GEODE-10201: Bump spring from 5.3.8 to 5.3.18 (#7531) d6564a2 is described below commit d6564a2dfe8de1c7454ac9025e5023b44a6ef172 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Thu Mar 31 12:20:17 2022 -0700 GEODE-10201: Bump spring from 5.3.8 to 5.3.18 (#7531) see https://github.com/spring-projects/spring-framework/issues/24434 --- .../src/test/resources/expected-pom.xml | 20 ++++++++++---------- .../gradle/plugins/DependencyConstraints.groovy | 2 +- .../integrationTest/resources/assembly_content.txt | 10 +++++----- .../resources/dependency_classpath.txt | 4 ++-- 4 files changed, 18 insertions(+), 18 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 index 07736ab..d592a35 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -790,61 +790,61 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aspects</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>5.3.8</version> + <version>5.3.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>5.3.8</version> + <version>5.3.18</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 a98e677..7b3fd0f 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 @@ -255,7 +255,7 @@ class DependencyConstraints implements Plugin<Project> { entry('spring-security-oauth2-jose') } - dependencySet(group: 'org.springframework', version: '5.3.8') { + dependencySet(group: 'org.springframework', version: '5.3.18') { entry('spring-aspects') entry('spring-beans') entry('spring-context') diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 1ec4c13..9c2b7b0 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1075,12 +1075,12 @@ lib/shiro-event-1.8.0.jar lib/shiro-lang-1.8.0.jar lib/slf4j-api-1.7.30.jar lib/snappy-0.4.jar -lib/spring-beans-5.3.8.jar -lib/spring-context-5.3.8.jar -lib/spring-core-5.3.8.jar -lib/spring-jcl-5.3.8.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.8.jar +lib/spring-web-5.3.18.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 1ba716a..f5068b6 100644 --- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt @@ -65,13 +65,13 @@ shiro-event-1.8.0.jar shiro-crypto-core-1.8.0.jar shiro-lang-1.8.0.jar slf4j-api-1.7.30.jar -spring-core-5.3.8.jar +spring-core-5.3.18.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.8.jar +spring-jcl-5.3.18.jar jetty-http-9.4.39.v20210325.jar jetty-io-9.4.39.v20210325.jar jetty-xml-9.4.39.v20210325.jar