mirror of https://github.com/apache/lucene.git
LUCENE-10042: JAR minimal manifest JDK entries are incorrectly set to build-JVM
This commit is contained in:
parent
597398439c
commit
b016c8dc2a
|
@ -70,6 +70,10 @@ ext {
|
|||
}
|
||||
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 @@ ext {
|
|||
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)
|
||||
|
|
|
@ -19,6 +19,12 @@ repositories {
|
|||
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')
|
||||
|
||||
|
|
|
@ -61,8 +61,9 @@ subprojects {
|
|||
"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']}"
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.gradle.util.GradleVersion
|
|||
configure(rootProject) {
|
||||
ext {
|
||||
expectedGradleVersion = '6.8.3'
|
||||
minJavaVersion = JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
wrapper {
|
||||
|
|
Loading…
Reference in New Issue