From 358c3c9e9e499d880150e23c5c981bc8109d3672 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Mon, 10 May 2021 12:52:15 -0700
Subject: [PATCH] Set the --add-opens JVM option for java.nio classes (e.g.
 DirectByteBuffer) to workaround Apache Geode issues on Java 16.

Configure Maven Toolchains Plugin and the Maven Surefire Plugin to use Maven Toolchains with JDK 16.

Resolves gh-497.
---
 spring-data-geode/pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spring-data-geode/pom.xml b/spring-data-geode/pom.xml
index 3bfa36a0..290786a0 100644
--- a/spring-data-geode/pom.xml
+++ b/spring-data-geode/pom.xml
@@ -20,6 +20,8 @@
 
 	<properties>
 		<project.root>${basedir}/..</project.root>
+		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+		<maven-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version>
 		<geode.version>1.13.3</geode.version>
 	</properties>
 
@@ -263,10 +265,15 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
+					<argLine>--add-opens java.base/java.nio=ALL-UNNAMED</argLine>
 					<includes>
 						<include>**/*Tests.java</include>
 						<include>**/*Test.java</include>
 					</includes>
+					<jdkToolchain>
+						<version>16</version>
+						<vendor>oracle</vendor>
+					</jdkToolchain>
 					<reuseForks>false</reuseForks>
 					<systemProperties>
 						<java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
@@ -277,6 +284,26 @@
 					</systemProperties>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-toolchains-plugin</artifactId>
+				<version>${maven-toolchains-plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>toolchain</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<toolchains>
+						<jdk>
+							<version>16</version>
+							<vendor>oracle</vendor>
+						</jdk>
+					</toolchains>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>