From f7c364c23c2264c82a665b825d99bbe3f725066b Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 30 Jun 2021 15:08:24 -0700 Subject: [PATCH] Refactor SDG Maven POM to conditionally apply JRE 16 JVM options and Maven Toolchains to Maven Plugins based on a Maven Profile. Resolves gh-497. --- spring-data-geode/pom.xml | 99 ++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/spring-data-geode/pom.xml b/spring-data-geode/pom.xml index ae2e3eec..0e1b5819 100644 --- a/spring-data-geode/pom.xml +++ b/spring-data-geode/pom.xml @@ -259,52 +259,57 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - - **/*Tests.java - **/*Test.java - - - 16 - oracle - - false - - ${basedir}/src/test/resources/java-util-logging.properties - ${basedir}/src/test/resources/trusted.keystore - true - error - apache-geode - - - - - org.apache.maven.plugins - maven-toolchains-plugin - ${maven-toolchains-plugin.version} - - - - toolchain - - - - - - - 16 - oracle - - - - - - + + + local-java16 + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED + + **/*Tests.java + **/*Test.java + + + 16 + oracle + + false + + ${basedir}/src/test/resources/java-util-logging.properties + ${basedir}/src/test/resources/trusted.keystore + true + error + apache-geode + + + + + org.apache.maven.plugins + maven-toolchains-plugin + ${maven-toolchains-plugin.version} + + + + toolchain + + + + + + + 16 + oracle + + + + + + + +