From d0a08ef594006b9780e79cede246c26a3e602ad6 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Wed, 18 Dec 2013 15:46:29 +0200
Subject: [PATCH] upgrading to spring 4

---
 experiments/pom.xml                                           | 2 +-
 guava/pom.xml                                                 | 2 +-
 httpclient/pom.xml                                            | 2 +-
 mockito/pom.xml                                               | 2 +-
 spring-all/pom.xml                                            | 2 +-
 spring-exceptions/pom.xml                                     | 2 +-
 spring-jpa/pom.xml                                            | 2 +-
 .../service/FooServicePersistenceIntegrationTest.java         | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/experiments/pom.xml b/experiments/pom.xml
index d91b88e49c..5dac0d546f 100644
--- 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
index f1c8adb4ee..f853a4d36a 100644
--- 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
index 339500651c..6185838d2b 100644
--- 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
index 72353719b0..c2d0e48b92 100644
--- 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
index a683a4c419..e7578a4181 100644
--- 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
index c57fe2259f..3f17e77d58 100644
--- 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
index bdf959e161..fea23f07b3 100644
--- 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/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
index 77a3ce95d9..2d8de007db 100644
--- a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -4,10 +4,10 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 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 class FooServicePersistenceIntegrationTest {
         service.create(entity);
     }
 
-    @Test(expected = DataException.class)
+    @Test(expected = DataAccessException.class)
     public final void temp_whenInvalidEntityIsCreated_thenDataException() {
         service.create(new Foo());
     }