Merge branch '6.x' of https://github.com/elastic/elasticsearch into 6.x

original-brownbear · Aug 31, 2018 · fdc5817 · fdc5817
2 parents 00b241a + a9216c4
commit fdc5817
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -24,15 +24,6 @@ plugins {
   id 'groovy'
 }
 
-gradlePlugin {
-  plugins {
-    simplePlugin {
-      id = 'elasticsearch.clusterformation'
-      implementationClass = 'org.elasticsearch.gradle.clusterformation.ClusterformationPlugin'
-    }
-  }
-}
-
 group = 'org.elasticsearch.gradle'
 
 String minimumGradleVersion = file('src/main/resources/minimumGradleVersion').text.trim()

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -211,7 +211,7 @@ class BuildPlugin implements Plugin<Project> {
             project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
             project.rootProject.ext.inFipsJvm = inFipsJvm
             project.rootProject.ext.gradleJavaVersion = JavaVersion.toVersion(gradleJavaVersion)
-            project.rootProject.ext.java9Home = findJavaHome("9")
+            project.rootProject.ext.java9Home = "${-> findJavaHome("9")}"
         }
 
         project.targetCompatibility = project.rootProject.ext.minimumRuntimeVersion

diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ForbiddenApisCliTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ForbiddenApisCliTask.java
@@ -51,7 +51,8 @@ public class ForbiddenApisCliTask extends DefaultTask {
     private JavaVersion targetCompatibility;
     private FileCollection classesDirs;
     private SourceSet sourceSet;
-    private String javaHome;
+    // This needs to be an object so it can hold Groovy GStrings
+    private Object javaHome;
 
     @Input
     public JavaVersion getTargetCompatibility() {
@@ -142,11 +143,11 @@ public Configuration getForbiddenAPIsConfiguration() {
     }
 
     @Input
-    public String getJavaHome() {
+    public Object getJavaHome() {
         return javaHome;
     }
 
-    public void setJavaHome(String javaHome) {
+    public void setJavaHome(Object javaHome) {
         this.javaHome = javaHome;
     }
 

diff --git a/...dSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties b/...dSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties
@@ -0,0 +1 @@
+implementation-class=org.elasticsearch.gradle.clusterformation.ClusterformationPlugin
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		implementation-class=org.elasticsearch.gradle.clusterformation.ClusterformationPlugin