Skip to content

Commit df46e27

Browse files
author
eugenp
committed
upgrading to spring 4
1 parent 9bd7030 commit df46e27

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎spring-hibernate3/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@
174174

175175
<properties>
176176
<!-- Spring -->
177-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
177+
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
178178
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
179179
<javassist.version>3.18.1-GA</javassist.version>
180180

181181
<!-- persistence -->
182182
<hibernate.version>3.6.10.Final</hibernate.version>
183183
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
184-
<tomcat-dbcp.version>7.0.41</tomcat-dbcp.version>
184+
<tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
185185

186186
<!-- logging -->
187187
<org.slf4j.version>1.7.5</org.slf4j.version>

‎spring-hibernate3/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import org.baeldung.persistence.model.Foo;
66
import org.baeldung.persistence.service.FooService;
77
import org.baeldung.spring.PersistenceConfig;
8-
import org.hibernate.exception.DataException;
98
import org.junit.Test;
109
import org.junit.runner.RunWith;
1110
import org.springframework.beans.factory.annotation.Autowired;
11+
import org.springframework.dao.DataAccessException;
1212
import org.springframework.dao.DataIntegrityViolationException;
1313
import org.springframework.dao.InvalidDataAccessApiUsageException;
1414
import org.springframework.test.context.ContextConfiguration;
@@ -51,7 +51,7 @@ public final void whenSameEntityIsCreatedTwice_thenDataException() {
5151
service.create(entity);
5252
}
5353

54-
@Test(expected = DataException.class)
54+
@Test(expected = DataAccessException.class)
5555
public final void temp_whenInvalidEntityIsCreated_thenDataException() {
5656
service.create(new Foo(randomAlphabetic(2048)));
5757
}

‎spring-security-rest-basic-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286

287287
<properties>
288288
<!-- Spring -->
289-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
289+
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
290290
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
291291

292292
<!-- persistence -->

‎spring-security-rest-custom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242

243243
<properties>
244244
<!-- Spring -->
245-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
245+
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
246246
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
247247

248248
<!-- persistence -->

‎spring-security-rest-digest-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275

276276
<properties>
277277
<!-- Spring -->
278-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
278+
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
279279
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
280280

281281
<!-- persistence -->

‎spring-security-rest-full/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257

258258
<properties>
259259
<!-- Spring -->
260-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
260+
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
261261
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
262262

263263
<!-- persistence -->

‎spring-security-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208

209209
<properties>
210210
<!-- Spring -->
211-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
211+
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
212212
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
213213

214214
<!-- persistence -->

0 commit comments

Comments
 (0)