Skip to content

Commit 3c1b0de

Browse files
DATAREDIS-540 - Assert compatibility with Spring 5.
Fix testsetup and add Spring-5 build profile to travis.yml.
1 parent febe4a9 commit 3c1b0de

5 files changed

+9
-16
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ env:
66
- PROFILE=spring42
77
- PROFILE=spring42-next
88
- PROFILE=spring43-next
9+
- PROFILE=spring5-next
910
cache:
1011
directories:
1112
- $HOME/.m2

src/test/java/org/springframework/data/redis/cache/RedisCacheManagerTransactionalUnitTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@
4040
import org.springframework.data.redis.test.util.RelaxedJUnit4ClassRunner;
4141
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
4242
import org.springframework.test.context.ContextConfiguration;
43-
import org.springframework.test.context.transaction.TransactionConfiguration;
4443
import org.springframework.transaction.PlatformTransactionManager;
4544
import org.springframework.transaction.annotation.Transactional;
4645

@@ -49,8 +48,7 @@
4948
*/
5049
@RunWith(RelaxedJUnit4ClassRunner.class)
5150
@ContextConfiguration
52-
@Transactional
53-
@TransactionConfiguration(transactionManager = "transactionManager")
51+
@Transactional(transactionManager = "transactionManager")
5452
public class RedisCacheManagerTransactionalUnitTests {
5553

5654
@Autowired protected CacheManager cacheManager;

src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014 the original author or authors.
2+
* Copyright 2014-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,7 +44,6 @@
4444
import org.springframework.test.annotation.Rollback;
4545
import org.springframework.test.context.ContextConfiguration;
4646
import org.springframework.test.context.transaction.AfterTransaction;
47-
import org.springframework.test.context.transaction.TransactionConfiguration;
4847
import org.springframework.transaction.PlatformTransactionManager;
4948
import org.springframework.transaction.annotation.Transactional;
5049

@@ -53,8 +52,7 @@
5352
*/
5453
@RunWith(RelaxedJUnit4ClassRunner.class)
5554
@ContextConfiguration
56-
@Transactional
57-
@TransactionConfiguration(transactionManager = "transactionManager")
55+
@Transactional(transactionManager = "transactionManager")
5856
public class TransactionalRedisCacheManagerWithCommitUnitTests {
5957

6058
@SuppressWarnings("rawtypes")//

src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014 the original author or authors.
2+
* Copyright 2014-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@
4040
import org.springframework.test.annotation.Rollback;
4141
import org.springframework.test.context.ContextConfiguration;
4242
import org.springframework.test.context.transaction.AfterTransaction;
43-
import org.springframework.test.context.transaction.TransactionConfiguration;
4443
import org.springframework.transaction.PlatformTransactionManager;
4544
import org.springframework.transaction.annotation.Transactional;
4645

@@ -49,8 +48,7 @@
4948
*/
5049
@RunWith(RelaxedJUnit4ClassRunner.class)
5150
@ContextConfiguration
52-
@Transactional
53-
@TransactionConfiguration(transactionManager = "transactionManager")
51+
@Transactional(transactionManager = "transactionManager")
5452
public class TransactionalRedisCacheManagerWithRollbackUnitTests {
5553

5654
@SuppressWarnings("rawtypes")//

src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014 the original author or authors.
2+
* Copyright 2014-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,13 +36,11 @@
3636
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
3737
import org.springframework.test.annotation.Rollback;
3838
import org.springframework.test.context.transaction.AfterTransaction;
39-
import org.springframework.test.context.transaction.TransactionConfiguration;
4039
import org.springframework.transaction.PlatformTransactionManager;
4140
import org.springframework.transaction.annotation.Transactional;
4241

4342
@RunWith(RelaxedJUnit4ClassRunner.class)
44-
@Transactional
45-
@TransactionConfiguration(transactionManager = "transactionManager")
43+
@Transactional(transactionManager = "transactionManager")
4644
public abstract class AbstractTransactionalTestBase {
4745

4846
@Configuration

0 commit comments

Comments
 (0)