Skip to content

Fix usage of the GlobalBuildInfoPlugin #1453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2020
Merged

Fix usage of the GlobalBuildInfoPlugin #1453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BaseBuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package org.elasticsearch.hadoop.gradle

import org.elasticsearch.gradle.info.BuildParams
import org.elasticsearch.gradle.info.GenerateGlobalBuildInfoTask
import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin
import org.elasticsearch.gradle.info.JavaHome
import org.elasticsearch.hadoop.gradle.util.Resources
Expand Down Expand Up @@ -64,6 +63,7 @@ class BaseBuildPlugin implements Plugin<Project> {
if (!project.rootProject.ext.has('buildInfoConfigured')) {

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

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

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

// Set on build settings
project.rootProject.ext.runtimeJavaHome = esHadoopRuntimeJava.javaHome.getAbsoluteFile()
project.rootProject.ext.runtimeJavaHome = esHadoopRuntimeJava.javaHome.get()
project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion

project.rootProject.ext.buildInfoConfigured = true
Expand Down