From 557851105ca08faa23ca7acf20e3576a3b57a2e5 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <ogierke@pivotal.io>
Date: Tue, 12 Mar 2019 13:07:40 +0100
Subject: [PATCH] #514 - Switch to Spring Boot 2.2.

Fixed infrastructure configuration in Eclipselink example.
---
 .../jpa/eclipselink/Application.java           |  6 ++----
 pom.xml                                        | 18 ++----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/jpa/eclipselink/src/main/java/example/springdata/jpa/eclipselink/Application.java b/jpa/eclipselink/src/main/java/example/springdata/jpa/eclipselink/Application.java
index 2a864249..4a5305b3 100644
--- a/jpa/eclipselink/src/main/java/example/springdata/jpa/eclipselink/Application.java
+++ b/jpa/eclipselink/src/main/java/example/springdata/jpa/eclipselink/Application.java
@@ -25,7 +25,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
 import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
 import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
 import org.springframework.transaction.jta.JtaTransactionManager;
@@ -46,9 +45,8 @@ public class Application extends JpaBaseConfiguration {
 	 * @param jtaTransactionManagerProvider
 	 */
 	protected Application(DataSource dataSource, JpaProperties properties,
-			ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider,
-			ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
-		super(dataSource, properties, jtaTransactionManagerProvider, transactionManagerCustomizers);
+			ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider) {
+		super(dataSource, properties, jtaTransactionManagerProvider);
 	}
 
 	/*
diff --git a/pom.xml b/pom.xml
index ad2e24d1..d9650ea2 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.1.5.RELEASE</version>
+		<version>2.2.0.M1</version>
 	</parent>
 
 	<modules>
@@ -35,32 +35,18 @@
 
 	<properties>
 		<apt.version>1.1.3</apt.version>
-		<lombok.version>1.18.4</lombok.version>
+		<lombok.version>1.18.6</lombok.version>
 	</properties>
 
 	<profiles>
 		<profile>
 			<id>spring-data-next</id>
-			<properties>
-				<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-			</properties>
-		</profile>
-		<profile>
-			<id>spring-data-next-releasetrain</id>
 			<properties>
 				<spring-data-releasetrain.version>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>
 				<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>
 				<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
 			</properties>
 		</profile>
-		<profile>
-			<id>spring-data-next-releasetrain-released</id>
-			<properties>
-				<spring-data-releasetrain.version>Moore-M2</spring-data-releasetrain.version>
-				<spring-hateoas.version>1.0.0.M1</spring-hateoas.version>
-				<spring-plugin.version>2.0.0.M1</spring-plugin.version>
-			</properties>
-		</profile>
 
 		<profile>
 			<id>java8</id>