@@ -21,7 +21,6 @@ package org.elasticsearch.hadoop.gradle
21
21
22
22
import org.elasticsearch.gradle.VersionProperties
23
23
import org.elasticsearch.gradle.info.BuildParams
24
- import org.elasticsearch.gradle.info.GenerateGlobalBuildInfoTask
25
24
import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin
26
25
import org.elasticsearch.gradle.info.JavaHome
27
26
import org.elasticsearch.hadoop.gradle.util.Resources
@@ -65,6 +64,7 @@ class BaseBuildPlugin implements Plugin<Project> {
65
64
if (! project. rootProject. ext. has(' buildInfoConfigured' )) {
66
65
67
66
JavaVersion minimumRuntimeVersion = JavaVersion . toVersion(Resources . getResourceContents(" /minimumRuntimeVersion" ))
67
+ println " Min runtime: ${ minimumRuntimeVersion} "
68
68
69
69
// We snap the runtime to java 8 since Hadoop needs to see some significant
70
70
// upgrades to support any runtime higher than that
@@ -78,12 +78,14 @@ class BaseBuildPlugin implements Plugin<Project> {
78
78
}
79
79
80
80
// 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
+ }
84
86
85
87
// Set on build settings
86
- project. rootProject. ext. runtimeJavaHome = esHadoopRuntimeJava. javaHome. getAbsoluteFile ()
88
+ project. rootProject. ext. runtimeJavaHome = esHadoopRuntimeJava. javaHome. get ()
87
89
project. rootProject. ext. minimumRuntimeVersion = minimumRuntimeVersion
88
90
89
91
project. rootProject. ext. buildInfoConfigured = true
0 commit comments