upgrading to spring 4

gspascoal · Dec 18, 2013 · d0a08ef · d0a08ef
1 parent 6b89587
commit d0a08ef
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/experiments/pom.xml b/experiments/pom.xml
@@ -255,7 +255,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->

diff --git a/guava/pom.xml b/guava/pom.xml
@@ -83,7 +83,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->

diff --git a/httpclient/pom.xml b/httpclient/pom.xml
@@ -95,7 +95,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->

diff --git a/mockito/pom.xml b/mockito/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->

diff --git a/spring-all/pom.xml b/spring-all/pom.xml
@@ -192,7 +192,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+        <org.springframework.version>4.0.0.RELEASE</org.springframework.version>
         <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
         <javassist.version>3.18.1-GA</javassist.version>
         <jstl.version>1.2</jstl.version>

diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
@@ -204,7 +204,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
 		<javassist.version>3.18.1-GA</javassist.version>
 		<jstl.version>1.2</jstl.version>

diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
@@ -177,7 +177,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
+		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->

diff --git a/.../src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/.../src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -4,10 +4,10 @@
 
 import org.baeldung.persistence.model.Foo;
 import org.baeldung.spring.PersistenceJPAConfig;
-import org.hibernate.exception.DataException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.test.context.ContextConfiguration;
@@ -50,7 +50,7 @@ public final void whenSameEntityIsCreatedTwice_thenDataException() {
         service.create(entity);
     }
 
-    @Test(expected = DataException.class)
+    @Test(expected = DataAccessException.class)
     public final void temp_whenInvalidEntityIsCreated_thenDataException() {
         service.create(new Foo());
     }