Skip to content

Commit dc67d52

Browse files
committed
spring-projects#435 - Upgrade to Spring Boot 2.1.1.RELEASE.
Upgrade to Spring Boot 2.1.1. Cleanup POM references.
1 parent c36c615 commit dc67d52

File tree

13 files changed

+17
-116
lines changed

13 files changed

+17
-116
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>5.0.2.RELEASE</spring.version>
13-
<spring-data.version>Kay-SR2</spring-data.version>
12+
<spring.version>5.1.0.RELEASE</spring.version>
13+
<spring-data.version>Lovelace-RELEASE</spring-data.version>
1414
</properties>
1515

1616
<dependencyManagement>

cassandra/example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<artifactId>spring-data-cassandra-example</artifactId>

cassandra/kotlin/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,6 @@
1111
<artifactId>spring-data-cassandra-kotlin</artifactId>
1212
<name>Spring Data Cassandra - Kotlin features</name>
1313

14-
<properties>
15-
<spring-data-releasetrain.version>Lovelace-RELEASE</spring-data-releasetrain.version>
16-
</properties>
17-
18-
<profiles>
19-
20-
<!-- Override property as the module always needs Lovelace -->
21-
22-
<profile>
23-
<id>spring-data-next</id>
24-
<properties>
25-
<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
26-
</properties>
27-
</profile>
28-
29-
</profiles>
30-
3114
<dependencies>
3215
<dependency>
3316
<groupId>org.jetbrains.kotlin</groupId>

cassandra/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141
<artifactId>cassandra-driver-core</artifactId>
4242
</dependency>
4343

44+
<!-- Required for Embedded Cassandra -->
4445
<dependency>
45-
<groupId>org.springframework.boot</groupId>
46-
<artifactId>spring-boot-starter-test</artifactId>
47-
<scope>test</scope>
46+
<groupId>com.codahale.metrics</groupId>
47+
<artifactId>metrics-core</artifactId>
48+
<version>3.0.2</version>
4849
</dependency>
4950

5051
</dependencies>

cassandra/reactive/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
<artifactId>reactor-core</artifactId>
1919
</dependency>
2020

21+
<dependency>
22+
<groupId>io.reactivex</groupId>
23+
<artifactId>rxjava</artifactId>
24+
</dependency>
25+
2126
<dependency>
2227
<groupId>io.reactivex.rxjava2</groupId>
2328
<artifactId>rxjava</artifactId>

jdbc/pom.xml

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

25-
<properties>
26-
<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
27-
</properties>
28-
29-
<profiles>
30-
31-
<!-- Override property as the module always needs Lovelace -->
32-
33-
<profile>
34-
<id>spring-data-next</id>
35-
<properties>
36-
<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
37-
</properties>
38-
</profile>
39-
40-
</profiles>
41-
4225
<dependencies>
4326

4427
<dependency>

jpa/deferred/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-deferred</artifactId>
1212
<name>Spring Data JPA - Deferred bootstrap modes</name>
1313

14-
<properties>
15-
<spring-data-releasetrain.version>Lovelace-RC2</spring-data-releasetrain.version>
16-
</properties>
17-
1814
<build>
1915
<plugins>
2016
<plugin>

jpa/vavr/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-vavr</artifactId>
1212
<name>Spring Data JPA - Vavr integration</name>
1313

14-
<properties>
15-
<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
16-
</properties>
17-
1814
<dependencies>
1915
<dependency>
2016
<groupId>io.vavr</groupId>

mongodb/change-streams/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,6 @@
1111
<artifactId>spring-data-mongodb-change-streams</artifactId>
1212
<name>Spring Data MongoDB - Change Streams</name>
1313

14-
<properties>
15-
<mongodb.version>3.8.0</mongodb.version>
16-
<mongo-driver-reactivestreams.version>1.9.0</mongo-driver-reactivestreams.version>
17-
<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
18-
</properties>
19-
20-
<profiles>
21-
22-
<!-- Override property as the module always needs Lovelace -->
23-
24-
<profile>
25-
<id>spring-data-next</id>
26-
<properties>
27-
<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
28-
</properties>
29-
</profile>
30-
31-
</profiles>
32-
3314
<dependencies>
3415

3516
<dependency>

mongodb/kotlin/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
<artifactId>spring-data-mongodb-kotlin</artifactId>
1212
<name>Spring Data MongoDB - Kotlin features</name>
1313

14-
<!-- Fix not released yet -->
15-
<properties>
16-
<spring-data-releasetrain.version>Kay-BUILD-SNAPSHOT</spring-data-releasetrain.version>
17-
</properties>
18-
1914
<dependencies>
2015
<dependency>
2116
<groupId>org.jetbrains.kotlin</groupId>

0 commit comments

Comments
 (0)