Prechádzať zdrojové kódy

fix eclipse config for qa projects

Ryan Ernst 10 rokov pred
rodič
commit
0dca49fae4

+ 14 - 10
build.gradle

@@ -147,9 +147,22 @@ subprojects {
   }
 }
 
-// IDE configuration
+// intellij configuration
 allprojects {
   apply plugin: 'idea'
+}
+
+if (hasProperty('projectsPrefix') == false) {
+  idea {
+    project {
+      languageLevel = sourceCompatibility
+      vcs = 'Git'
+    }
+  }
+}
+
+// ecplise configuration
+allprojects {
   apply plugin: 'eclipse'
 
   // TODO: similar for intellij
@@ -162,13 +175,4 @@ allprojects {
   tasks.eclipse.dependsOn(cleanEclipse)
 }
 
-idea {
-  if (project != null) {
-    // could be null, if this project is attached to another...
-    project {
-      languageLevel = sourceCompatibility
-      vcs = 'Git'
-    }
-  }
-}
 

+ 1 - 1
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy

@@ -30,7 +30,6 @@ class RestTestPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.pluginManager.apply('java-base')
         project.pluginManager.apply('carrotsearch.randomized-testing')
-        project.pluginManager.apply('idea')
 
         // remove some unnecessary tasks for a qa test
         project.tasks.removeAll { it.name in ['assemble', 'buildDependents'] }
@@ -53,6 +52,7 @@ class RestTestPlugin implements Plugin<Project> {
         project.eclipse {
             classpath {
                 sourceSets = [project.sourceSets.test]
+                plusConfigurations = [project.configurations.testRuntime]
             }
         }
     }

+ 0 - 2
distribution/ziphack/build.gradle

@@ -1,2 +0,0 @@
-
-confi