Skip to content

Commit a816713

Browse files
committed
Don't ignore 'orm.jdk.max' from gradle.properties
1 parent 59d3453 commit a816713

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ private JavaLanguageVersion getJavaLanguageVersion(Settings settings, String nam
5656
return JavaLanguageVersion.of( fromProjProp );
5757
}
5858

59+
// This extracts info from gradle.properties
60+
final String fromGradleProp = settings.getProviders().gradleProperty( name ).getOrNull();
61+
if ( fromGradleProp != null && !fromGradleProp.isEmpty() ) {
62+
return JavaLanguageVersion.of( fromGradleProp );
63+
}
64+
5965
return JavaLanguageVersion.of( JavaVersion.current().getMajorVersion() );
6066
}
6167
}

0 commit comments

Comments
 (0)