Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#240 - Upgraded to Ingalls RC1.

Browse Source 
Upgrade to Spring Boot 1.5 snapshots due to minor API changes in Spring Data REST so that recompilation is requited and only 1.5 picks up Ingalls. Upgraded to Querydsl 4.1.4, Spring Framework 5 build profile to 5.0 M3.

Switched to @SpringBootTest in Spring Data Redis samples as the previously deprecated @SpringApplicationConfiguation has been removed in 1.5.
This commit is contained in:
Oliver Gierke
2016-12-22 14:06:31 +01:00
parent 4ed34e9b3a
commit e3139f0822
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<modules>
@@ -34,9 +34,9 @@
<apt.version>1.1.3</apt.version>
<java.version>1.8</java.version>
<querydsl.version>4.1.3</querydsl.version>
<spring-data-releasetrain.version>Ingalls-M1</spring-data-releasetrain.version>
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
<querydsl.version>4.1.4</querydsl.version>
<spring-data-releasetrain.version>Ingalls-RC1</spring-data-releasetrain.version>
<spring-hateoas.version>0.22.0.RELEASE</spring-hateoas.version>
<jedis.version>2.9.0</jedis.version>
<cassandra-driver.version>3.0.3</cassandra-driver.version>
@@ -46,8 +46,7 @@
<profile>
<id>spring5</id>
<properties>
<spring.version>5.0.0.M2</spring.version>
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
<spring.version>5.0.0.M3</spring.version>
</properties>
</profile>
</profiles>

4
redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
View File

@@ -28,7 +28,7 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataAccessException;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.RedisCallback;
@@ -43,7 +43,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Christoph Strobl
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = { AppConfig.class })
@SpringBootTest(classes = { AppConfig.class })
public class BasicUsageTests {
@Autowired RedisTemplate<String, String> template;