From a66b87653f8ebc3bf2c805d77df8fbdc1f55f60a Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 27 Feb 2020 10:55:09 +0100
Subject: [PATCH] #555 - Upgrade Java versions.

Add build profile for Java 14. Allow failures for Java 15 as we carry dependencies that do not support newer class files. Enable preview features for Java 13-15. Add javax.annotation to Java 9+ profile. Disable geode examples on Java 13+ as test utilities do not propagate feature preview flag until spring-projects/spring-test-data-geode#18 is resolved.
---
 .travis.yml |  15 ++++---
 pom.xml     | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7554cce9..29fdf3f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,23 @@
 language: java
 
-matrix:
+os: linux
+
+jobs:
   include:
     - jdk: openjdk8
       env: JDK='OpenJDK 8'
-    - env: JDK='OpenJDK 11'
-      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 11
+    - jdk: openjdk11
+      env: JDK='OpenJDK 11'
     - env: JDK='OpenJDK 12'
       before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 12
     - env: JDK='OpenJDK 13'
       before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 13
+    - env: JDK='OpenJDK 14'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -f 14
     - env: JDK='OpenJDK EA'
       before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh
+  allow_failures:
+    - env: JDK='OpenJDK EA'
 
 addons:
   apt:
@@ -22,8 +28,7 @@ addons:
       - couchbase-server-community
 
 services:
-  - couchbase-server
-  - redis-server
+  - redis
   - docker
 
 cache:
diff --git a/pom.xml b/pom.xml
index 50adabf9..e98f6d45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.data.examples</groupId>
@@ -19,7 +20,6 @@
 		<module>bom</module>
 		<module>couchbase</module>
 		<module>elasticsearch</module>
-		<module>geode</module>
 		<module>jdbc</module>
 		<module>jpa</module>
 		<module>ldap</module>
@@ -69,6 +69,22 @@
 				<!-- Embedded Cassandra (cassandra-all) is not compatible with Java runtime 9 and higher.
 				 See https://issues.apache.org/jira/browse/CASSANDRA-9608 -->
 				<module>cassandra</module>
+				<module>geode</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>java11</id>
+
+			<activation>
+				<jdk>11</jdk>
+			</activation>
+
+			<modules>
+
+				<!-- Embedded Cassandra (cassandra-all) is not compatible with Java runtime 9 and higher.
+				 See https://issues.apache.org/jira/browse/CASSANDRA-9608 -->
+				<module>geode</module>
 			</modules>
 		</profile>
 
@@ -84,9 +100,104 @@
 					<groupId>javax.xml.bind</groupId>
 					<artifactId>jaxb-api</artifactId>
 				</dependency>
+				<dependency>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+				</dependency>
 			</dependencies>
 		</profile>
 
+		<profile>
+			<id>java-13+</id>
+
+			<activation>
+				<jdk>[13,)</jdk>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<argLine>--enable-preview</argLine>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<configuration>
+							<argLine>--enable-preview</argLine>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>java-13</id>
+
+			<activation>
+				<jdk>13</jdk>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<configuration>
+							<release>13</release>
+							<compilerArgs>
+								--enable-preview
+							</compilerArgs>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>java-14</id>
+
+			<activation>
+				<jdk>14</jdk>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<configuration>
+							<release>14</release>
+							<compilerArgs>
+								--enable-preview
+							</compilerArgs>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>java-15</id>
+
+			<activation>
+				<jdk>15</jdk>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<configuration>
+							<release>15</release>
+							<compilerArgs>
+								--enable-preview
+							</compilerArgs>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
 	</profiles>
 
 	<developers>