Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make sure test.jdk.launcher.args is passed as jvm args to test launcher" 

This reverts commit d7a46451ce.
This commit is contained in:
Yoann Rodière 2024-02-20 15:45:25 +01:00
parent 0cb2de5490
commit 4f884f0bc5
4 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
View File

@ -81,11 +81,6 @@ public class JavaModulePlugin implements Plugin<Project> {
javaToolchainSpec.getLanguageVersion().set( jdkVersionsConfig.getTestLauncherVersion() );
} )
);
final String launcherArgs = jdkVersionsConfig.getTest().getLauncherArgs();
if ( launcherArgs != null ) {
testTask.jvmArgs( (Object[]) launcherArgs.split( " " ) );
}
}
}
}

24
local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionConfig.java
View File

@ -30,7 +30,6 @@ public class JdkVersionConfig {
public static final String DSL_NAME = "jdkVersions";
public static final String MAIN_JDK_VERSION = "main.jdk.version";
public static final String TEST_JDK_VERSION = "test.jdk.version";
public static final String TEST_JDK_LAUNCHER_ARGS = "test.jdk.launcher.args";
private final boolean explicit;
private final JavaLanguageVersion baseline;
@ -44,12 +43,11 @@ public class JdkVersionConfig {
JavaLanguageVersion mainReleaseVersion,
JavaLanguageVersion testCompileVersion,
JavaLanguageVersion testReleaseVersion,
JavaLanguageVersion testLauncherVersion,
String testLauncherArgs) {
JavaLanguageVersion testLauncherVersion) {
this.explicit = explicit;
this.baseline = baseline;
this.main = new MainJdks( mainCompileVersion, mainReleaseVersion );
this.test = new TestJdks( testCompileVersion, testReleaseVersion, testLauncherVersion, testLauncherArgs );
this.test = new TestJdks( testCompileVersion, testReleaseVersion, testLauncherVersion );
}
public boolean isExplicitlyConfigured() {
@ -112,8 +110,7 @@ public class JdkVersionConfig {
JavaLanguageVersion explicitTestVersion,
JavaLanguageVersion gradleJdkVersion,
JavaLanguageVersion baselineJdkVersion,
JavaLanguageVersion maxSupportedJdkVersion,
String testLauncherArgs) {
JavaLanguageVersion maxSupportedJdkVersion) {
final boolean explicitlyConfigured = explicitMainVersion != null || explicitTestVersion != null;
final JavaLanguageVersion mainCompileVersion;
@ -147,8 +144,7 @@ public class JdkVersionConfig {
mainReleaseVersion,
testCompileVersion,
testReleaseVersion,
testLauncherVersion,
testLauncherArgs
testLauncherVersion
);
}
else {
@ -173,8 +169,7 @@ public class JdkVersionConfig {
baselineJdkVersion,
gradleJdkVersion,
baselineJdkVersion,
gradleJdkVersion,
testLauncherArgs
gradleJdkVersion
);
}
}
@ -250,17 +245,14 @@ public class JdkVersionConfig {
private final JavaLanguageVersion compileVersion;
private final JavaLanguageVersion releaseVersion;
private final JavaLanguageVersion launcherVersion;
private final String launcherArgs;
public TestJdks(
JavaLanguageVersion compileVersion,
JavaLanguageVersion releaseVersion,
JavaLanguageVersion launcherVersion,
String launcherArgs) {
JavaLanguageVersion launcherVersion) {
this.compileVersion = compileVersion;
this.releaseVersion = releaseVersion;
this.launcherVersion = launcherVersion;
this.launcherArgs = launcherArgs;
}
public JavaLanguageVersion getCompiler() {
@ -281,10 +273,6 @@ public class JdkVersionConfig {
return launcherVersion;
}
public String getLauncherArgs() {
return launcherArgs;
}
@Override
public String toString() {
return "[compile: " + compileVersion + ", release:" + releaseVersion + ", launcher: " + launcherVersion + "]";

6
local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionPlugin.java
View File

@ -26,7 +26,6 @@ import org.gradle.jvm.toolchain.JavaToolchainSpec;
import org.jetbrains.annotations.NotNull;
import static org.hibernate.orm.toolchains.JdkVersionConfig.MAIN_JDK_VERSION;
import static org.hibernate.orm.toolchains.JdkVersionConfig.TEST_JDK_LAUNCHER_ARGS;
import static org.hibernate.orm.toolchains.JdkVersionConfig.TEST_JDK_VERSION;
import static org.hibernate.orm.toolchains.JdkVersionConfig.createVersionConfig;
import static org.hibernate.orm.toolchains.JdkVersionConfig.extractVersion;
@ -52,16 +51,13 @@ public class JdkVersionPlugin implements Plugin<Project> {
final VersionCatalog jdkVersions = versionCatalogs.named( "jdks" );
final JavaLanguageVersion baselineJdkVersion = getJavaLanguageVersion( jdkVersions, "baseline" );
final JavaLanguageVersion maxSupportedJdkVersion = getJavaLanguageVersion( jdkVersions, "maxSupportedBytecode" );
final Object testLauncherArgsObject = project.getProperties().get( TEST_JDK_LAUNCHER_ARGS );
final String testLauncherArgs = testLauncherArgsObject == null ? null : testLauncherArgsObject.toString();
final JdkVersionConfig jdkVersionConfig = createVersionConfig(
explicitMainVersion,
explicitTestVersion,
gradleJdkVersion,
baselineJdkVersion,
maxSupportedJdkVersion,
testLauncherArgs
maxSupportedJdkVersion
);
project.getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );

8
local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java
View File

@ -6,7 +6,6 @@
*/
package org.hibernate.orm.toolchains;
import org.gradle.StartParameter;
import org.gradle.api.JavaVersion;
import org.gradle.api.Plugin;
import org.gradle.api.artifacts.VersionCatalog;
@ -18,7 +17,6 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion;
import org.jetbrains.annotations.NotNull;
import static org.hibernate.orm.toolchains.JdkVersionConfig.MAIN_JDK_VERSION;
import static org.hibernate.orm.toolchains.JdkVersionConfig.TEST_JDK_LAUNCHER_ARGS;
import static org.hibernate.orm.toolchains.JdkVersionConfig.TEST_JDK_VERSION;
import static org.hibernate.orm.toolchains.JdkVersionConfig.createVersionConfig;
import static org.hibernate.orm.toolchains.JdkVersionConfig.extractVersion;
@ -41,17 +39,13 @@ public class JdkVersionSettingsPlugin implements Plugin<Settings> {
// maxSupportedJdkVersion = getJavaLanguageVersion( jdkVersions, "maxSupportedBytecode" );
baselineJdkVersion = JavaLanguageVersion.of( "11" );
maxSupportedJdkVersion = JavaLanguageVersion.of( "17" );
final StartParameter startParameters = settings.getGradle().getStartParameter();
final Object testLauncherArgsObject = startParameters.getProjectProperties().get( TEST_JDK_LAUNCHER_ARGS );
final String testLauncherArgs = testLauncherArgsObject == null ? null : testLauncherArgsObject.toString();
final JdkVersionConfig jdkVersionConfig = createVersionConfig(
explicitMainVersion,
explicitTestVersion,
gradleJdkVersion,
baselineJdkVersion,
maxSupportedJdkVersion,
testLauncherArgs
maxSupportedJdkVersion
);
settings.getGradle().getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );