You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2019/04/23 16:28:53 UTC

[geode] branch develop updated: GEODE-6620: Upgrading springframework library (#3472)

This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6e17bdd  GEODE-6620: Upgrading springframework library (#3472)
6e17bdd is described below

commit 6e17bddad1a1efaff10c71a0ba12e6edf166520a
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Tue Apr 23 09:28:41 2019 -0700

    GEODE-6620: Upgrading springframework library (#3472)
    
       * Springframework libraries were updated from 4.3.20.RELEASE to 4.3.23.RELEASE
---
 .../src/test/resources/expected-pom.xml              | 20 ++++++++++----------
 .../gradle/plugins/DependencyConstraints.groovy      |  2 +-
 .../integrationTest/resources/assembly_content.txt   | 12 ++++++------
 .../resources/dependency_classpath.txt               |  2 +-
 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 86667ea..29aaafd 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -700,61 +700,61 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aspects</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-oxm</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.RELEASE</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
-        <version>4.3.20.RELEASE</version>
+        <version>4.3.23.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 07bd706..3abdbdf 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
@@ -233,7 +233,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-security-web')
     }
 
-    dependencySet(group: 'org.springframework', version: '4.3.20.RELEASE') {
+    dependencySet(group: 'org.springframework', version: '4.3.23.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 5cc2a63..7e5ead8 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -977,13 +977,13 @@ lib/shiro-event-1.4.0.jar
 lib/shiro-lang-1.4.0.jar
 lib/slf4j-api-1.7.25.jar
 lib/snappy-0.4.jar
-lib/spring-aop-4.3.20.RELEASE.jar
-lib/spring-beans-4.3.20.RELEASE.jar
-lib/spring-context-4.3.20.RELEASE.jar
-lib/spring-core-4.3.20.RELEASE.jar
-lib/spring-expression-4.3.20.RELEASE.jar
+lib/spring-aop-4.3.23.RELEASE.jar
+lib/spring-beans-4.3.23.RELEASE.jar
+lib/spring-context-4.3.23.RELEASE.jar
+lib/spring-core-4.3.23.RELEASE.jar
+lib/spring-expression-4.3.23.RELEASE.jar
 lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-4.3.20.RELEASE.jar
+lib/spring-web-4.3.23.RELEASE.jar
 lib/swagger-annotations-1.5.20.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 2f2a908..5b0a6f8 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -78,6 +78,6 @@ shiro-event-1.4.0.jar
 shiro-lang-1.4.0.jar
 slf4j-api-1.7.25.jar
 snappy-0.4.jar
-spring-core-4.3.20.RELEASE.jar
+spring-core-4.3.23.RELEASE.jar
 spring-shell-1.2.0.RELEASE.jar
 swagger-annotations-1.5.20.jar
\ No newline at end of file