upgrading to spring 4

This commit is contained in:
eugenp 2013-12-18 15:41:36 +02:00
parent 9bd7030906
commit df46e27e23
7 changed files with 9 additions and 9 deletions

View File

@ -174,14 +174,14 @@
<properties> <properties>
<!-- Spring --> <!-- 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> <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<javassist.version>3.18.1-GA</javassist.version> <javassist.version>3.18.1-GA</javassist.version>
<!-- persistence --> <!-- persistence -->
<hibernate.version>3.6.10.Final</hibernate.version> <hibernate.version>3.6.10.Final</hibernate.version>
<mysql-connector-java.version>5.1.27</mysql-connector-java.version> <mysql-connector-java.version>5.1.27</mysql-connector-java.version>
<tomcat-dbcp.version>7.0.41</tomcat-dbcp.version> <tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.version> <org.slf4j.version>1.7.5</org.slf4j.version>

View File

@ -5,10 +5,10 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
import org.baeldung.persistence.model.Foo; import org.baeldung.persistence.model.Foo;
import org.baeldung.persistence.service.FooService; import org.baeldung.persistence.service.FooService;
import org.baeldung.spring.PersistenceConfig; import org.baeldung.spring.PersistenceConfig;
import org.hibernate.exception.DataException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
@ -51,7 +51,7 @@ public class FooServicePersistenceIntegrationTest {
service.create(entity); service.create(entity);
} }
@Test(expected = DataException.class) @Test(expected = DataAccessException.class)
public final void temp_whenInvalidEntityIsCreated_thenDataException() { public final void temp_whenInvalidEntityIsCreated_thenDataException() {
service.create(new Foo(randomAlphabetic(2048))); service.create(new Foo(randomAlphabetic(2048)));
} }

View File

@ -286,7 +286,7 @@
<properties> <properties>
<!-- Spring --> <!-- 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> <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->

View File

@ -242,7 +242,7 @@
<properties> <properties>
<!-- Spring --> <!-- 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> <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->

View File

@ -275,7 +275,7 @@
<properties> <properties>
<!-- Spring --> <!-- 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> <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->

View File

@ -257,7 +257,7 @@
<properties> <properties>
<!-- Spring --> <!-- 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> <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->

View File

@ -208,7 +208,7 @@
<properties> <properties>
<!-- Spring --> <!-- 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> <org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->