LUCENE-10042: JAR minimal manifest JDK entries are incorrectly set to build-JVM
diff --git a/build.gradle b/build.gradle
index 6a6b79b..a7541a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,6 +70,10 @@
}
return m[0][1] as int
}
+
+ // Minimum Java version required to compile and run Lucene.
+ minJavaVersion = JavaVersion.VERSION_11
+
// snapshot build marker used in scripts.
snapshotBuild = version.contains("SNAPSHOT")
@@ -79,8 +83,6 @@
buildTime = DateTimeFormatter.ofPattern("HH:mm:ss").format(tstamp)
buildYear = DateTimeFormatter.ofPattern("yyyy").format(tstamp)
- minJavaVersion = JavaVersion.VERSION_11
-
// Allow definiting external tool locations using system props.
externalTool = { name ->
def resolved = propertyOrDefault("${name}.exe", name as String)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 68246e3..9c0222a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -19,6 +19,12 @@
mavenCentral()
}
+ext {
+ // Minimum Java version required to compile buildSrc.
+ minJavaVersion = JavaVersion.VERSION_11
+}
+
+
// Make sure the build environment is consistent.
apply from: file('../gradle/validation/check-environment.gradle')
diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle
index 5915a8c..e767f54 100644
--- a/gradle/java/jar-manifest.gradle
+++ b/gradle/java/jar-manifest.gradle
@@ -61,8 +61,9 @@
"Specification-Version" : project.baseVersion,
"Specification-Title" : title,
- "X-Compile-Source-JDK" : "${project.sourceCompatibility}",
- "X-Compile-Target-JDK" : "${project.targetCompatibility}",
+ // Evaluate these properties lazily so that the defaults are applied properly.
+ "X-Compile-Source-JDK" : "${-> project.sourceCompatibility}",
+ "X-Compile-Target-JDK" : "${-> project.targetCompatibility}",
"X-Build-JDK" : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
"X-Build-OS" : "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}"
diff --git a/gradle/validation/check-environment.gradle b/gradle/validation/check-environment.gradle
index 46b2f86..7935036 100644
--- a/gradle/validation/check-environment.gradle
+++ b/gradle/validation/check-environment.gradle
@@ -23,7 +23,6 @@
configure(rootProject) {
ext {
expectedGradleVersion = '6.8.3'
- minJavaVersion = JavaVersion.VERSION_11
}
wrapper {
