upgrading to spring 4

This commit is contained in:
eugenp 2013-12-18 15:46:29 +02:00
parent 6b89587e8b
commit d0a08ef594
8 changed files with 9 additions and 9 deletions

View File

@ -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 -->

View File

@ -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 -->

View File

@ -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 -->

View File

@ -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 -->

View File

@ -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>

View File

@ -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>

View File

@ -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 -->

View File

@ -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());
}