Skip to content

Commit 0c1bee0

Browse files
odrotbohmodrotbohm
committed
spring-projects#128 - Upgraded to Spring Data Gosling GA.
Spring Boot 1.3.0 M2 -> 1.3.0 M4 Spring Framework 4.2.0 -> 4.2.1
1 parent 9a91c40 commit 0c1bee0

File tree

11 files changed

+15
-34
lines changed

11 files changed

+15
-34
lines changed

‎bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<name>Spring Data - Using the BOM for dependency management</name>
1010

1111
<properties>
12-
<spring.version>4.2.0.RELEASE</spring.version>
13-
<spring-data.version>Fowler-RELEASE</spring-data.version>
12+
<spring.version>4.2.1.RELEASE</spring.version>
13+
<spring-data.version>Gosling-RELEASE</spring-data.version>
1414
</properties>
1515

1616
<dependencyManagement>

‎jpa/java8/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
<version>1.0.0.BUILD-SNAPSHOT</version>
99
</parent>
1010

11-
<properties>
12-
<spring-data-releasetrain.version>Gosling-BUILD-SNAPSHOT</spring-data-releasetrain.version>
13-
</properties>
14-
1511
<artifactId>spring-data-jpa-java8</artifactId>
1612
<name>Spring Data JPA - Java 8 specific features</name>
17-
13+
1814
</project>

‎jpa/security/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
<artifactId>spring-data-jpa-security</artifactId>
1212
<name>Spring Data JPA - Spring Security integration</name>
1313

14-
<properties>
15-
<spring-security.version>4.0.0.RELEASE</spring-security.version>
16-
</properties>
17-
1814
<dependencies>
1915
<dependency>
2016
<groupId>org.springframework.boot</groupId>

‎mongodb/security/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
<artifactId>spring-data-mongodb-security</artifactId>
1212
<name>Spring Data MongoDB - Spring Security Integration</name>
1313

14-
<properties>
15-
<spring-data-releasetrain.version>Gosling-BUILD-SNAPSHOT</spring-data-releasetrain.version>
16-
</properties>
17-
1814
<dependencies>
1915

2016
<dependency>

‎pom.xml

Lines changed: 4 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.0.M2</version>
15+
<version>1.3.0.M4</version>
1616
</parent>
1717

1818
<modules>
@@ -33,9 +33,10 @@
3333

3434
<apt.version>1.1.3</apt.version>
3535
<java.version>1.8</java.version>
36-
<spring.version>4.2.0.RELEASE</spring.version>
36+
<spring.version>4.2.1.RELEASE</spring.version>
3737
<querydsl.version>3.6.6</querydsl.version>
38-
<spring-data-releasetrain.version>Gosling-RC1</spring-data-releasetrain.version>
38+
<spring-hateoas.version>0.19.0.RELEASE</spring-hateoas.version>
39+
<spring-data-releasetrain.version>Gosling-RELEASE</spring-data-releasetrain.version>
3940

4041
</properties>
4142

‎rest/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<module>headers</module>
2323
</modules>
2424

25-
<properties>
26-
<spring-hateoas.version>0.18.0.RELEASE</spring-hateoas.version>
27-
</properties>
28-
2925
<dependencies>
3026
<dependency>
3127
<groupId>org.springframework.boot</groupId>

‎rest/starbucks/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
<dependency>
2323
<groupId>com.mysema.querydsl</groupId>
2424
<artifactId>querydsl-mongodb</artifactId>
25-
<version>3.6.6</version>
25+
<version>${querydsl.version}</version>
2626
</dependency>
2727

2828
<dependency>
2929
<groupId>org.springframework.data</groupId>
3030
<artifactId>spring-data-rest-hal-browser</artifactId>
31+
<version>2.4.0.DATAREST-627-SNAPSHOT</version>
3132
<scope>runtime</scope>
3233
</dependency>
3334

‎web/example/pom.xml

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

55
<artifactId>spring-data-web-example</artifactId>
66

7-
<name>Spring Data - Web support example</name>
7+
<name>Spring Data - Basic web example</name>
88

99
<parent>
1010
<groupId>org.springframework.data.examples</groupId>

‎web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<version>1.0.0.BUILD-SNAPSHOT</version>
1212
</parent>
1313

14-
<name>Spring Data Web - Examples</name>
14+
<name>Spring Data - Web examples</name>
1515
<description>Sample projects for Spring Data Web Support</description>
1616
<inceptionYear>2015</inceptionYear>
1717

‎web/querydsl/pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44

55
<artifactId>spring-data-web-querydsl</artifactId>
66

7-
<name>Spring Data Web - QueryDSL Example</name>
7+
<name>Spring Data - QueryDSL web example</name>
88

99
<parent>
1010
<groupId>org.springframework.data.examples</groupId>
1111
<artifactId>spring-data-web-examples</artifactId>
1212
<version>1.0.0.BUILD-SNAPSHOT</version>
1313
</parent>
1414

15-
<properties>
16-
<spring-hateoas.version>0.18.0.BUILD-SNAPSHOT</spring-hateoas.version>
17-
<spring-data-releasetrain.version>Gosling-BUILD-SNAPSHOT</spring-data-releasetrain.version>
18-
</properties>
19-
2015
<dependencies>
2116

2217
<dependency>
@@ -80,12 +75,12 @@
8075

8176
<build>
8277
<plugins>
83-
78+
8479
<plugin>
8580
<groupId>org.springframework.boot</groupId>
8681
<artifactId>spring-boot-maven-plugin</artifactId>
8782
</plugin>
88-
83+
8984
<plugin>
9085
<groupId>com.mysema.maven</groupId>
9186
<artifactId>apt-maven-plugin</artifactId>

‎web/querydsl/src/main/java/example/users/web/UserController.java

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

2222
import org.springframework.beans.factory.annotation.Autowired;
2323
import org.springframework.data.domain.Pageable;
24-
import org.springframework.data.web.querydsl.QuerydslPredicate;
24+
import org.springframework.data.querydsl.binding.QuerydslPredicate;
2525
import org.springframework.stereotype.Controller;
2626
import org.springframework.ui.Model;
2727
import org.springframework.util.MultiValueMap;

0 commit comments

Comments
 (0)