Skip to content

Commit 99d1597

Browse files
committed
#155 - Upgraded to Spring Boot 1.4 M1.
Switched to renamed Redis starter POM. Removed invalid @transactional annotation from projections example in MongoDB. Added Mark Paluch as contributor in the root POM.
1 parent bb833a2 commit 99d1597

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.context.annotation.Configuration;
3030
import org.springframework.data.projection.TargetAware;
3131
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
32-
import org.springframework.transaction.annotation.Transactional;
3332

3433
/**
3534
* Integration tests for {@link CustomerRepository} to show projection capabilities.
@@ -38,7 +37,6 @@
3837
*/
3938
@RunWith(SpringJUnit4ClassRunner.class)
4039
@SpringApplicationConfiguration
41-
@Transactional
4240
public class CustomerRepositoryIntegrationTest {
4341

4442
@Configuration

pom.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>1.3.2.RELEASE</version>
15+
<version>1.4.0.M1</version>
1616
</parent>
1717

1818
<modules>
@@ -35,8 +35,6 @@
3535
<apt.version>1.1.3</apt.version>
3636
<java.version>1.8</java.version>
3737
<querydsl.version>4.0.8</querydsl.version>
38-
<solr.version>5.4.1</solr.version>
39-
<spring-data-releasetrain.version>Hopper-M1</spring-data-releasetrain.version>
4038

4139
</properties>
4240

@@ -61,6 +59,11 @@
6159
<name>Greg Turnquist</name>
6260
<email>[email protected]</email>
6361
</developer>
62+
<developer>
63+
<id>mpaluch</id>
64+
<name>Mark Paluch</name>
65+
<email>[email protected]</email>
66+
</developer>
6467
</developers>
6568

6669
<dependencies>

redis/cluster-sentinel/pom.xml

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

1717
<dependency>
1818
<groupId>org.springframework.boot</groupId>
19-
<artifactId>spring-boot-starter-redis</artifactId>
19+
<artifactId>spring-boot-starter-data-redis</artifactId>
2020
</dependency>
2121
<dependency>
2222
<groupId>${project.groupId}</groupId>

redis/cluster/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<dependency>
1818
<groupId>org.springframework.boot</groupId>
19-
<artifactId>spring-boot-starter-redis</artifactId>
19+
<artifactId>spring-boot-starter-data-redis</artifactId>
2020
</dependency>
21-
21+
2222
<dependency>
2323
<groupId>${project.groupId}</groupId>
2424
<artifactId>spring-data-redis-example-utils</artifactId>
@@ -31,7 +31,7 @@
3131
<artifactId>spring-boot-configuration-processor</artifactId>
3232
<optional>true</optional>
3333
</dependency>
34-
34+
3535
</dependencies>
3636

3737
</project>

redis/example/pom.xml

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

1717
<dependency>
1818
<groupId>org.springframework.boot</groupId>
19-
<artifactId>spring-boot-starter-redis</artifactId>
19+
<artifactId>spring-boot-starter-data-redis</artifactId>
2020
</dependency>
2121

2222
<dependency>

redis/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<groupId>org.springframework.data.examples</groupId>
1010
<artifactId>spring-data-examples</artifactId>
1111
<version>1.0.0.BUILD-SNAPSHOT</version>
12+
<relativePath>../pom.xml</relativePath>
1213
</parent>
1314

1415
<name>Spring Data Redis - Examples</name>

redis/util/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<artifactId>spring-data-redis-example-utils</artifactId>
6-
<name>Spring Data Redis - Example utilities</name>
7-
85
<parent>
96
<groupId>org.springframework.data.examples</groupId>
107
<artifactId>spring-data-redis-examples</artifactId>
118
<version>1.0.0.BUILD-SNAPSHOT</version>
129
<relativePath>../pom.xml</relativePath>
1310
</parent>
1411

12+
<artifactId>spring-data-redis-example-utils</artifactId>
13+
<name>Spring Data Redis - Example utilities</name>
14+
1515
<dependencies>
1616
<dependency>
1717
<groupId>junit</groupId>
1818
<artifactId>junit</artifactId>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>
22-
<artifactId>spring-boot-starter-redis</artifactId>
22+
<artifactId>spring-boot-starter-data-redis</artifactId>
2323
</dependency>
2424
</dependencies>
2525

0 commit comments

Comments
 (0)