HHH-17805 Fix jpamodelgen quarkus/jd tests with jdk >= 17
This commit is contained in:
parent
004158cc58
commit
096b667520
|
@ -130,8 +130,7 @@ compileTestJava {
|
|||
// Tests with records
|
||||
if ( jdkVersions.test.release.asInt() >= 17 && jdkVersions.explicit ) {
|
||||
// We need to configure the source and target version to 17
|
||||
//compileTestJava17Java {
|
||||
compileTestJava {
|
||||
def testCompilerConfig = {
|
||||
javaCompiler = javaToolchains.compilerFor {
|
||||
languageVersion = jdkVersions.test.compile
|
||||
}
|
||||
|
@ -139,11 +138,43 @@ if ( jdkVersions.test.release.asInt() >= 17 && jdkVersions.explicit ) {
|
|||
targetCompatibility = 17
|
||||
}
|
||||
|
||||
test {
|
||||
compileTestJava {
|
||||
configure testCompilerConfig
|
||||
}
|
||||
|
||||
compileQuarkusOrmPanacheJava {
|
||||
configure testCompilerConfig
|
||||
}
|
||||
|
||||
compileQuarkusHrPanacheJava {
|
||||
configure testCompilerConfig
|
||||
}
|
||||
|
||||
compileJakartaDataJava {
|
||||
configure testCompilerConfig
|
||||
}
|
||||
|
||||
def testLauncherConfig = {
|
||||
javaLauncher = javaToolchains.launcherFor {
|
||||
languageVersion = jdkVersions.test.launcher
|
||||
}
|
||||
}
|
||||
|
||||
test {
|
||||
configure testLauncherConfig
|
||||
}
|
||||
|
||||
quarkusOrmPanacheTest {
|
||||
configure testLauncherConfig
|
||||
}
|
||||
|
||||
quarkusHrPanacheTest {
|
||||
configure testLauncherConfig
|
||||
}
|
||||
|
||||
jakartaDataTest {
|
||||
configure testLauncherConfig
|
||||
}
|
||||
}
|
||||
else {
|
||||
sourceSets {
|
||||
|
|
Loading…
Reference in New Issue