IGNITE-4211 Update Spring dependency to latest stable version

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a51477c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a51477c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a51477c0

Branch: refs/heads/ignite-2893
Commit: a51477c0277785db4089467dde9c8da7132a46da
Parents: 1a9b38d
Author: daradurvs <daradu...@gmail.com>
Authored: Wed Apr 19 16:11:56 2017 +0300
Committer: Anton Vinogradov <a...@apache.org>
Committed: Wed Apr 19 16:11:56 2017 +0300

----------------------------------------------------------------------
 .../test/config/loaders/grid-cfg-2-grids.xml    |  6 +++---
 .../apache/ignite/cache/spring/SpringCache.java |  6 ++++++
 .../GridSpringResourceInjectionSelfTest.java    | 20 ++++++++++----------
 parent/pom.xml                                  |  2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a51477c0/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml 
b/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml
index af4792a..a26423d 100644
--- a/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml
+++ b/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml
@@ -28,7 +28,7 @@
     <!--
         Grid configuration.
     -->
-    <bean id="grid.cfg.1" 
class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true">
+    <bean id="grid.cfg.1" 
class="org.apache.ignite.configuration.IgniteConfiguration">
         <property name="igniteInstanceName" value="grid-factory-test-1"/>
 
         <property name="connectorConfiguration"><null/></property>
@@ -45,7 +45,7 @@
         </property>
     </bean>
 
-    <bean id="grid.cfg.2" 
class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true">
+    <bean id="grid.cfg.2" 
class="org.apache.ignite.configuration.IgniteConfiguration">
         <property name="igniteInstanceName" value="grid-factory-test-2"/>
 
         <property name="connectorConfiguration"><null/></property>
@@ -61,4 +61,4 @@
             </bean>
         </property>
     </bean>
-</beans>
+</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/a51477c0/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
----------------------------------------------------------------------
diff --git 
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java 
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
index 77b30c5..f35ed2a 100644
--- 
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
+++ 
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.cache.spring;
 
 import java.io.Serializable;
+import java.util.concurrent.Callable;
 import org.apache.ignite.IgniteCache;
 import org.springframework.cache.Cache;
 import org.springframework.cache.support.SimpleValueWrapper;
@@ -82,6 +83,11 @@ class SpringCache implements Cache {
     }
 
     /** {@inheritDoc} */
+    @Override public <T> T get(Object key, Callable<T> valLdr) {
+        throw new UnsupportedOperationException();
+    }
+
+    /** {@inheritDoc} */
     @Override public ValueWrapper putIfAbsent(Object key, Object val) {
         Object old;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a51477c0/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
 
b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
index e70b49e..827dd72 100644
--- 
a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
+++ 
b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
@@ -105,8 +105,8 @@ public class GridSpringResourceInjectionSelfTest extends 
GridCommonAbstractTest
         }, anotherGrid, null);
 
         assertTrue("Unexpected message: " + err.getMessage(), 
err.getMessage().startsWith("No qualifying bean of type " +
-            
"[org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest$DummyResourceBean]"
 +
-            " is defined: expected single matching bean but found 2:"));
+            
"'org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest$DummyResourceBean'"
 +
+            " available: expected single matching bean but found 2:"));
 
         G.stop("anotherGrid", false);
     }
@@ -124,7 +124,7 @@ public class GridSpringResourceInjectionSelfTest extends 
GridCommonAbstractTest
 
                 return null;
             }
-        }, "No bean named 'nonExistentResource' is defined");
+        }, "No bean named 'nonExistentResource' available");
     }
 
     /**
@@ -140,8 +140,8 @@ public class GridSpringResourceInjectionSelfTest extends 
GridCommonAbstractTest
 
                 return null;
             }
-        }, "No qualifying bean of type 
[org.apache.ignite.internal.processors.resource." +
-            "GridSpringResourceInjectionSelfTest$AnotherDummyResourceBean] is 
defined");
+        }, "No qualifying bean of type 
'org.apache.ignite.internal.processors.resource." +
+            "GridSpringResourceInjectionSelfTest$AnotherDummyResourceBean' 
available");
     }
 
     /**
@@ -250,8 +250,8 @@ public class GridSpringResourceInjectionSelfTest extends 
GridCommonAbstractTest
             }, anotherGrid, null);
 
             assertTrue("Unexpected message: " + err.getMessage(), 
err.getMessage().startsWith("No qualifying bean of type " +
-                
"[org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest$DummyResourceBean]"
 +
-                " is defined: expected single matching bean but found 2:"));
+                
"'org.apache.ignite.internal.processors.resource.GridSpringResourceInjectionSelfTest$DummyResourceBean'"
 +
+                " available: expected single matching bean but found 2:"));
         }
         finally {
             G.stop("anotherGrid", false);
@@ -275,7 +275,7 @@ public class GridSpringResourceInjectionSelfTest extends 
GridCommonAbstractTest
 
                 return null;
             }
-        }, "No bean named 'nonExistentResource' is defined");
+        }, "No bean named 'nonExistentResource' available");
     }
 
     /**
@@ -295,8 +295,8 @@ public class GridSpringResourceInjectionSelfTest extends 
GridCommonAbstractTest
 
                 return null;
             }
-        }, "No qualifying bean of type 
[org.apache.ignite.internal.processors.resource" +
-                
".GridSpringResourceInjectionSelfTest$AnotherDummyResourceBean] is defined");
+        }, "No qualifying bean of type 
'org.apache.ignite.internal.processors.resource" +
+            ".GridSpringResourceInjectionSelfTest$AnotherDummyResourceBean' 
available");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/a51477c0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index adb7995..24ff924 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
         <ignite.edition>fabric</ignite.edition>
         <hadoop.version>2.4.1</hadoop.version>
         <spark.version>2.1.0</spark.version>
-        <spring.version>4.1.0.RELEASE</spring.version>
+        <spring.version>4.3.7.RELEASE</spring.version>
         <spring.data.version>1.2.1.RELEASE</spring.data.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.build.timestamp.format>MMMM d 
yyyy</maven.build.timestamp.format>

Reply via email to