From 5982633098549a7b876ce0bf3c47c1b21abc46a5 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Wed, 13 Nov 2019 12:50:19 -0600
Subject: [PATCH] DATAREST-1453 - Enable JDK 11+ builds.

---
 .travis.yml |  9 +++++++++
 Jenkinsfile | 44 ++++++++++++++++++++++++++++++++++++++++----
 pom.xml     |  2 +-
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..92de315d4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: java
+
+cache:
+  directories:
+    - $HOME/.m2
+
+install: true
+
+script: "./mvnw clean dependency:list test -Pjava11 -Dsort -B"
diff --git a/Jenkinsfile b/Jenkinsfile
index 412e545ae..1a2b25062 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,28 @@ pipeline {
 	}
 
 	stages {
-		stage("Test") {
+		stage("test: baseline (jdk8)") {
+			when {
+				anyOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 30, unit: 'MINUTES') }
+			steps {
+				sh 'rm -rf ?'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+			}
+		}
+
+		stage("Test other configurations") {
 			when {
 				anyOf {
 					branch 'master'
@@ -21,10 +42,10 @@ pipeline {
 				}
 			}
 			parallel {
-				stage("test: baseline") {
+				stage("test: baseline (jdk11)") {
 					agent {
 						docker {
-							image 'adoptopenjdk/openjdk8:latest'
+							image 'adoptopenjdk/openjdk11:latest'
 							label 'data'
 							args '-v $HOME:/tmp/jenkins-home'
 						}
@@ -32,11 +53,26 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
 						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
+					}
+				}
+				stage("test: baseline (jdk13)") {
+					agent {
+						docker {
+							image 'adoptopenjdk/openjdk13:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
 					}
 				}
 			}
 		}
+
 		stage('Release to artifactory') {
 			when {
 				anyOf {
diff --git a/pom.xml b/pom.xml
index a65a10135..7f14a6126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.JDK11-SNAPSHOT</version>
 		<relativePath/>
 	</parent>