Skip to content

Commit 4940e98

Browse files
committed
Fix usage of the GlobalBuildInfoPlugin (#1453)
1 parent 507d752 commit 4940e98

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BaseBuildPlugin.groovy

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package org.elasticsearch.hadoop.gradle
2121

2222
import org.elasticsearch.gradle.VersionProperties
2323
import org.elasticsearch.gradle.info.BuildParams
24-
import org.elasticsearch.gradle.info.GenerateGlobalBuildInfoTask
2524
import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin
2625
import org.elasticsearch.gradle.info.JavaHome
2726
import org.elasticsearch.hadoop.gradle.util.Resources
@@ -65,6 +64,7 @@ class BaseBuildPlugin implements Plugin<Project> {
6564
if (!project.rootProject.ext.has('buildInfoConfigured')) {
6665

6766
JavaVersion minimumRuntimeVersion = JavaVersion.toVersion(Resources.getResourceContents("/minimumRuntimeVersion"))
67+
println "Min runtime: ${minimumRuntimeVersion}"
6868

6969
// We snap the runtime to java 8 since Hadoop needs to see some significant
7070
// upgrades to support any runtime higher than that
@@ -78,12 +78,14 @@ class BaseBuildPlugin implements Plugin<Project> {
7878
}
7979

8080
// Set on global build info
81-
GenerateGlobalBuildInfoTask generateTask = project.getTasks().getByName("generateGlobalBuildInfo") as GenerateGlobalBuildInfoTask
82-
generateTask.setMinimumRuntimeVersion(minimumRuntimeVersion)
83-
generateTask.setRuntimeJavaHome(esHadoopRuntimeJava.javaHome.getAbsoluteFile())
81+
BuildParams.init { params ->
82+
params.setMinimumRuntimeVersion(minimumRuntimeVersion)
83+
params.setRuntimeJavaVersion(minimumRuntimeVersion)
84+
params.setRuntimeJavaHome(esHadoopRuntimeJava.javaHome.get())
85+
}
8486

8587
// Set on build settings
86-
project.rootProject.ext.runtimeJavaHome = esHadoopRuntimeJava.javaHome.getAbsoluteFile()
88+
project.rootProject.ext.runtimeJavaHome = esHadoopRuntimeJava.javaHome.get()
8789
project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
8890

8991
project.rootProject.ext.buildInfoConfigured = true

0 commit comments

Comments
 (0)