From 544656ea76c65704a879f05881affbd4c0c8b5f2 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Tue, 20 Jul 2021 14:38:13 -0700
Subject: [PATCH] Refactor SDG Maven POM to include a Maven Profile to remotely
 (Jenkins) build and run SDG on JDK/JRE 16.

Refactor SDG Jenkinsfile to include the 'remote-java16' Maven Profile in Java 16 Jenkins CI builds.

Resolves gh-497.
---
 Jenkinsfile               |  2 +-
 spring-data-geode/pom.xml | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 87e8898b..951ac757 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
 									sh 'rm -Rf `find . -name "newDB"`'
 									sh 'rm -Rf `find . -name "server" | grep -v "src"`'
 									sh 'rm -Rf `find . -name "*.log"`'
-									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
+									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -P java11,remote-java16 clean dependency:list test -Dsort -U -B'
 								}
 							}
 						}
diff --git a/spring-data-geode/pom.xml b/spring-data-geode/pom.xml
index cc897429..d1bd1e03 100644
--- a/spring-data-geode/pom.xml
+++ b/spring-data-geode/pom.xml
@@ -333,6 +333,32 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>remote-java16</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+							<includes>
+								<include>**/*Tests.java</include>
+								<include>**/*Test.java</include>
+							</includes>
+							<reuseForks>false</reuseForks>
+							<systemProperties>
+								<java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
+								<javax.net.ssl.keyStore>${basedir}/src/test/resources/trusted.keystore</javax.net.ssl.keyStore>
+								<gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
+								<logback.log.level>error</logback.log.level>
+								<spring.profiles.active>apache-geode</spring.profiles.active>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 </project>