From 926b4bc27698ac746bf5929300bc30d6156f32c7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 27 Feb 2020 15:45:12 +0100
Subject: [PATCH] #556 - Upgrade to Spring Boot 2.2.5.

Exclude Eclipselink for Java 15 build profile as it isn't compatible with Java 15.
---
 jpa/pom.xml | 12 +++++++++++-
 pom.xml     |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/jpa/pom.xml b/jpa/pom.xml
index 86b87ef0..82440371 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -24,7 +24,6 @@
 		<module>jpa21</module>
 		<module>security</module>
 		<module>multiple-datasources</module>
-		<module>eclipselink</module>
 		<module>query-by-example</module>
 		<module>vavr</module>
 		<module>deferred</module>
@@ -37,6 +36,17 @@
 				<hibernate.version>5.3.0.Final</hibernate.version>
 			</properties>
 		</profile>
+		<profile>
+			<id>java-next</id>
+
+			<activation>
+				<jdk>[8,14]</jdk>
+			</activation>
+
+			<modules>
+				<module>eclipselink</module>
+			</modules>
+		</profile>
 	</profiles>
 
 	<dependencies>
diff --git a/pom.xml b/pom.xml
index f3bf1690..06429dc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.2.5.RELEASE</version>
 	</parent>
 
 	<modules>