You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/04/10 20:46:20 UTC
[geode] branch support/1.12 updated: GEODE-7970: bump spring to
latest (#4927)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 4150f34 GEODE-7970: bump spring to latest (#4927)
4150f34 is described below
commit 4150f3480753838386d8062d94365470091d048b
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Wed Apr 8 08:51:33 2020 -0700
GEODE-7970: bump spring to latest (#4927)
(cherry picked from commit ead319cc04e284838275669c2d502e1a8c5ad822)
---
.../src/test/resources/expected-pom.xml | 30 +++++++++++-----------
.../gradle/plugins/DependencyConstraints.groovy | 4 +--
.../integrationTest/resources/assembly_content.txt | 10 ++++----
.../resources/dependency_classpath.txt | 4 +--
.../integrationTest/resources/expected_jars.txt | 2 --
5 files changed, 24 insertions(+), 26 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 434fbfe..674b5cd 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -700,91 +700,91 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>5.2.1.RELEASE</version>
+ <version>5.2.5.RELEASE</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 7ea6d32..7a4cc3d 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
@@ -230,7 +230,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('selenium-support')
}
- dependencySet(group: 'org.springframework.security', version: '5.2.1.RELEASE') {
+ dependencySet(group: 'org.springframework.security', version: '5.2.3.RELEASE') {
entry('spring-security-config')
entry('spring-security-core')
entry('spring-security-ldap')
@@ -238,7 +238,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('spring-security-web')
}
- dependencySet(group: 'org.springframework', version: '5.2.1.RELEASE') {
+ dependencySet(group: 'org.springframework', version: '5.2.5.RELEASE') {
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 7e93ca3..2d2ad1d 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1055,12 +1055,12 @@ lib/shiro-event-1.5.2.jar
lib/shiro-lang-1.5.2.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
-lib/spring-beans-5.2.1.RELEASE.jar
-lib/spring-context-5.2.1.RELEASE.jar
-lib/spring-core-5.2.1.RELEASE.jar
-lib/spring-jcl-5.2.1.RELEASE.jar
+lib/spring-beans-5.2.5.RELEASE.jar
+lib/spring-context-5.2.5.RELEASE.jar
+lib/spring-core-5.2.5.RELEASE.jar
+lib/spring-jcl-5.2.5.RELEASE.jar
lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-5.2.1.RELEASE.jar
+lib/spring-web-5.2.5.RELEASE.jar
lib/swagger-annotations-1.5.23.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 37e9d7f..caf499f 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.5.2.jar
shiro-lang-1.5.2.jar
slf4j-api-1.7.28.jar
swagger-annotations-1.5.23.jar
-spring-core-5.2.1.RELEASE.jar
+spring-core-5.2.5.RELEASE.jar
javax.activation-api-1.2.0.jar
jline-2.12.jar
HdrHistogram-2.1.11.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
-spring-jcl-5.2.1.RELEASE.jar
+spring-jcl-5.2.5.RELEASE.jar
commons-codec-1.11.jar
jetty-xml-9.4.21.v20190926.jar
jetty-http-9.4.21.v20190926.jar
diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt
index ebc2450..ebf6239 100644
--- a/geode-assembly/src/integrationTest/resources/expected_jars.txt
+++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -98,9 +98,7 @@ spring-core
spring-expression
spring-hateoas
spring-jcl
-spring-jdbc
spring-ldap-core
-spring-orm
spring-oxm
spring-plugin-core
spring-plugin-metadata