From 34e73d360ef7d3e3de57c71b46094644abfb7094 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 11 Nov 2019 13:41:36 +0100
Subject: [PATCH] #542 - Upgrade to Spring Boot 2.2.1.

---
 jdbc/jooq/pom.xml | 10 +---------
 pom.xml           |  3 +--
 r2dbc/pom.xml     | 15 +--------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/jdbc/jooq/pom.xml b/jdbc/jooq/pom.xml
index d9dc5da1..4683a11b 100644
--- a/jdbc/jooq/pom.xml
+++ b/jdbc/jooq/pom.xml
@@ -14,21 +14,14 @@
 	<name>Spring Data JDBC - Usage with jOOQ</name>
 	<description>Sample project demonstrating Spring Data JDBC features</description>
 
-	<properties>
-		<jooq.version>3.11.0</jooq.version>
-		<spring-boot-starter-jooq.version>2.0.3.RELEASE</spring-boot-starter-jooq.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>${jooq.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jooq</artifactId>
-			<version>${spring-boot-starter-jooq.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jooq</groupId>
@@ -42,7 +35,6 @@
 			<plugin>
 				<groupId>org.jooq</groupId>
 				<artifactId>jooq-codegen-maven</artifactId>
-				<version>${jooq.version}</version>
 
 				<executions>
 					<execution>
@@ -71,4 +63,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 5446fdc5..91a68d8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.2.1.RELEASE</version>
 	</parent>
 
 	<modules>
@@ -35,7 +35,6 @@
 
 	<properties>
 		<apt.version>1.1.3</apt.version>
-		<lombok.version>1.18.6</lombok.version>
 	</properties>
 
 	<profiles>
diff --git a/r2dbc/pom.xml b/r2dbc/pom.xml
index 9cadde19..2b3673ae 100644
--- a/r2dbc/pom.xml
+++ b/r2dbc/pom.xml
@@ -21,7 +21,7 @@
 	</modules>
 
 	<properties>
-		<spring-boot-data-r2dbc.version>0.1.0.BUILD-SNAPSHOT</spring-boot-data-r2dbc.version>
+		<spring-boot-data-r2dbc.version>0.1.0.M2</spring-boot-data-r2dbc.version>
 		<r2dbc-h2.version>0.8.0.BUILD-SNAPSHOT</r2dbc-h2.version>
 	</properties>
 
@@ -47,17 +47,4 @@
 
 	</dependencies>
 
-	<profiles>
-
-		<!-- Override property as the module always needs Moore -->
-
-		<profile>
-			<id>spring-data-next</id>
-			<properties>
-				<spring-data-releasetrain.version>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-			</properties>
-		</profile>
-
-	</profiles>
-
 </project>