Skip to content

Commit 335043e

Browse files
authored
Fix usage of the GlobalBuildInfoPlugin (#1453)
1 parent 152ee2e commit 335043e

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
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.hadoop.gradle
2121

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

6665
JavaVersion minimumRuntimeVersion = JavaVersion.toVersion(Resources.getResourceContents("/minimumRuntimeVersion"))
66+
println "Min runtime: ${minimumRuntimeVersion}"
6767

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

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

8486
// Set on build settings
85-
project.rootProject.ext.runtimeJavaHome = esHadoopRuntimeJava.javaHome.getAbsoluteFile()
87+
project.rootProject.ext.runtimeJavaHome = esHadoopRuntimeJava.javaHome.get()
8688
project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
8789

8890
project.rootProject.ext.buildInfoConfigured = true

0 commit comments

Comments
 (0)