From 7d82649ed4ee14a68c74baf0cb6cd9e4709307d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 14 Dec 2020 12:10:10 +0100 Subject: [PATCH] HHH-14371 Correctly set JVM args in the JVM running tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Turns out getJvmArgs() returns a copy, so modifying that copy won't change the JVM args. Signed-off-by: Yoann Rodière --- gradle/java-module.gradle | 2 +- hibernate-core/hibernate-core.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle index ab7b4e9164..8fbcafeb35 100644 --- a/gradle/java-module.gradle +++ b/gradle/java-module.gradle @@ -233,7 +233,7 @@ if ( gradle.ext.javaToolchainEnabled ) { } // Configure JVM Options - jvmArgs.addAll( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) ) + jvmArgs( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) ) // Display version of Java tools doFirst { diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index be0003e5d9..7d21c9a440 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -281,7 +281,7 @@ task testJavassist(type: Test) { } // Configure JVM Options - jvmArgs.addAll( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) ) + jvmArgs( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) ) // Display version of Java tools doFirst {