geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject incubator-geode git commit: GEODE-799: Update Spring to 4.2.2 and SDG to 1.7.2
Date Tue, 02 Feb 2016 20:15:36 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 11c3f933e -> 50f2a2a36


GEODE-799: Update Spring to 4.2.2 and SDG to 1.7.2


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/50f2a2a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/50f2a2a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/50f2a2a3

Branch: refs/heads/develop
Commit: 50f2a2a36663030e656bb029969cb004a0b0f61e
Parents: 11c3f93
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Tue Jan 26 06:46:22 2016 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Tue Feb 2 12:14:47 2016 -0800

----------------------------------------------------------------------
 .../management/internal/web/util/ConvertUtilsJUnitTest.java      | 2 +-
 gradle/dependency-versions.properties                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/50f2a2a3/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
b/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
index c079c0a..ff4ed41 100644
--- a/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
+++ b/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
@@ -147,7 +147,7 @@ public class ConvertUtilsJUnitTest {
       ConvertUtils.convert(createResource(null, "test".getBytes()));
     }
     catch (IllegalArgumentException expected) {
-      assertEquals("The filename of Resource (Content of file (null).) must be specified!",
expected.getMessage());
+      assertEquals("The filename of Resource (Byte array resource [Content of file (null).])
must be specified!", expected.getMessage());
       throw expected;
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/50f2a2a3/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 4f68974..98c3629 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -72,10 +72,10 @@ scala.version = 2.10.0
 slf4j-api.version = 1.7.7
 snappy-java.version = 1.1.1.6
 spring-data-commons.version = 1.9.1.RELEASE
-spring-data-gemfire.version = 1.5.1.RELEASE
+spring-data-gemfire.version = 1.7.2.RELEASE
 spring-hateos.version = 0.16.0.RELEASE
 spring-shell.version = 1.1.0.RELEASE
-springframework.version = 3.2.12.RELEASE
+springframework.version = 4.2.4.RELEASE
 stephenc-findbugs.version = 1.3.9-1
 spymemcached.version = 2.9.0
 swagger.version = 1.3.2


Mime
View raw message