Remove eclipse conditionals

build.gradle

@@ -357,6 +357,41 @@ allprojects {
         // this is *NOT* a path or a file.
         folder.output = "build-eclipse/" + i
       }
+
+      // Eclipse now supports main and test source sets, but the Gradle and buildship tooling does not yet so we
+      // edit the generated .classpath to correctly mark test vs non test code and dependencies
+      // for more info: https://github.com/eclipse/buildship/issues/689 and https://github.com/gradle/gradle/issues/4802
+      Set<String> testOnlyProjectDependencies = new HashSet();
+      if (configurations.findByName("testCompile") != null) {
+        testOnlyProjectDependencies.addAll(
+          configurations.testCompile.getDependencies().findAll {
+            it instanceof ProjectDependency
+          }.collect {
+            it.dependencyProject.path
+          }
+        )
+      }
+      if (configurations.findByName("compile") != null) {
+        testOnlyProjectDependencies.removeAll(
+                configurations.compile.getDependencies().findAll {
+                  it instanceof ProjectDependency
+                }.collect {
+                  it.dependencyProject.path
+                }
+        )
+      }
+      classpath.entries.each {
+        if (it.hasProperty("entryAttributes")) {
+          if (it.entryAttributes.containsKey("gradle_used_by_scope")) {
+            it.entryAttributes['test'] = (it.entryAttributes['gradle_used_by_scope'] == 'test')
+          }
+          if (it.hasProperty("path") && it.path.startsWith("/:")) {
+            if (testOnlyProjectDependencies.contains(it.path.substring(1))) {
+              it.entryAttributes['test'] = true
+            }
+          }
+        }
+      }
     }
   }
 
@@ -528,4 +563,4 @@ allprojects {
       checkPart1.dependsOn check
     }
   } 
-}
+}

buildSrc/src/main/resources/eclipse.settings/org.eclipse.jdt.core.prefs

@@ -15,6 +15,8 @@ eclipse.preferences.version=1
 # org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 # org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 
+# We check this in Gradle. Eclipse fails this check because it doesn't have separate class-paths for
+org.eclipse.jdt.core.circularClasspath=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.formatter.comment.line_length=140
 org.eclipse.jdt.core.formatter.lineSplit=140

client/rest-high-level/build.gradle

@@ -68,10 +68,8 @@ dependencies {
   testCompile project(":rest-api-spec")
   // Needed for serialization tests:
   // (In order to serialize a server side class to a client side class or the other way around)
-  if (isEclipse == false || project.path == ":client:rest-high-level-tests") {
-    testCompile(project(':x-pack:plugin:core')) {
-        exclude group: 'org.elasticsearch', module: 'elasticsearch-rest-high-level-client'
-    }
+  testCompile(project(':x-pack:plugin:core')) {
+      exclude group: 'org.elasticsearch', module: 'elasticsearch-rest-high-level-client'
   }
 
   restSpec project(':rest-api-spec')
@@ -100,19 +98,6 @@ forbiddenApisMain {
   signaturesFiles += files('src/main/resources/forbidden/rest-high-level-signatures.txt')
 }
 
-if (isEclipse) {
-    // in eclipse the project is under a fake root, we need to change around the source sets
-    sourceSets {
-        if (project.path == ":client:rest-high-level") {
-            main.java.srcDirs = ['java']
-            main.resources.srcDirs = ['resources']
-        } else {
-            test.java.srcDirs = ['java']
-            test.resources.srcDirs = ['resources']
-        }
-    }
-}
-
 File nodeCert = file("./testnode.crt")
 File nodeTrustStore = file("./testnode.jks")
 

libs/build.gradle

@@ -34,7 +34,6 @@ subprojects {
                 Project depProject = dep.dependencyProject
                 if (depProject != null
                         && false == depProject.path.equals(':libs:elasticsearch-core')
-                        && false == isEclipse 
                         && depProject.path.startsWith(':libs')) {
                     throw new InvalidUserDataException("projects in :libs "
                             + "may not depend on other projects libs except "

libs/core/.project1

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>:libs:elasticsearch-core</name>
+	<comment>Elasticsearch subproject :libs:elasticsearch-core</comment>
+	<projects/>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<linkedResources/>
+	<filteredResources/>
+</projectDescription>

libs/core/build.gradle

@@ -26,10 +26,8 @@ dependencies {
     testCompile "junit:junit:${versions.junit}"
     testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
 
-    if (isEclipse == false || project.path == ":libs:elasticsearch-core-tests") {
-        testCompile(project(":test:framework")) {
-            exclude group: 'org.elasticsearch', module: 'elasticsearch-core'
-        }
+    testCompile(project(":test:framework")) {
+        exclude group: 'org.elasticsearch', module: 'elasticsearch-core'
     }
 }
 
@@ -39,19 +37,6 @@ forbiddenApisMain {
     replaceSignatureFiles 'jdk-signatures'
 }
 
-if (isEclipse) {
-    // in eclipse the project is under a fake root, we need to change around the source sets
-    sourceSets {
-        if (project.path == ":libs:elasticsearch-core") {
-            main.java.srcDirs = ['java']
-            main.resources.srcDirs = ['resources']
-        } else {
-            test.java.srcDirs = ['java']
-            test.resources.srcDirs = ['resources']
-        }
-    }
-}
-
 thirdPartyAudit.ignoreMissingClasses (
     // from log4j
     'org/osgi/framework/AdaptPermission',

libs/dissect/build.gradle

@@ -18,10 +18,8 @@
  */
 
 dependencies {
-     if (isEclipse == false || project.path == ":libs:elasticsearch-dissect-tests") {
-        testCompile(project(":test:framework")) {
-            exclude group: 'org.elasticsearch', module: 'elasticsearch-dissect'
-        }
+    testCompile(project(":test:framework")) {
+        exclude group: 'org.elasticsearch', module: 'elasticsearch-dissect'
     }
     testCompile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
     testCompile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
@@ -32,15 +30,3 @@ forbiddenApisMain {
     replaceSignatureFiles 'jdk-signatures'
 }
 
-if (isEclipse) {
-    // in eclipse the project is under a fake root, we need to change around the source sets
-    sourceSets {
-        if (project.path == ":libs:elasticsearch-dissect") {
-            main.java.srcDirs = ['java']
-            main.resources.srcDirs = ['resources']
-        } else {
-            test.java.srcDirs = ['java']
-            test.resources.srcDirs = ['resources']
-        }
-    }
-}

libs/geo/build.gradle

@@ -22,10 +22,8 @@ apply plugin: 'nebula.maven-base-publish'
 apply plugin: 'nebula.maven-scm'
 
 dependencies {
-    if (isEclipse == false || project.path == ":libs:elasticsearch-geo-tests") {
-        testCompile(project(":test:framework")) {
-            exclude group: 'org.elasticsearch', module: 'elasticsearch-geo'
-        }
+    testCompile(project(":test:framework")) {
+        exclude group: 'org.elasticsearch', module: 'elasticsearch-geo'
     }
 }
 
@@ -35,15 +33,3 @@ forbiddenApisMain {
     replaceSignatureFiles 'jdk-signatures'
 }
 
-if (isEclipse) {
-    // in eclipse the project is under a fake root, we need to change around the source sets
-    sourceSets {
-        if (project.path == ":libs:elasticsearch-geo") {
-            main.java.srcDirs = ['java']
-            main.resources.srcDirs = ['resources']
-        } else {
-            test.java.srcDirs = ['java']
-            test.resources.srcDirs = ['resources']
-        }
-    }
-}

libs/grok/build.gradle

@@ -22,30 +22,15 @@ dependencies {
     // joni dependencies:
     compile 'org.jruby.jcodings:jcodings:1.0.44'
 
-    if (isEclipse == false || project.path == ":libs:elasticsearch-grok-tests") {
-        testCompile(project(":test:framework")) {
-            exclude group: 'org.elasticsearch', module: 'elasticsearch-grok'
-        }
+    testCompile(project(":test:framework")) {
+        exclude group: 'org.elasticsearch', module: 'elasticsearch-grok'
     }
 }
 
 forbiddenApisMain {
     replaceSignatureFiles 'jdk-signatures'
 }
 
-if (isEclipse) {
-    // in eclipse the project is under a fake root, we need to change around the source sets
-    sourceSets {
-        if (project.path == ":libs:elasticsearch-grok") {
-            main.java.srcDirs = ['java']
-            main.resources.srcDirs = ['resources']
-        } else {
-            test.java.srcDirs = ['java']
-            test.resources.srcDirs = ['resources']
-        }
-    }
-}
-
 thirdPartyAudit.ignoreMissingClasses (
         // joni has AsmCompilerSupport, but that isn't being used:
         'org.objectweb.asm.ClassWriter',

libs/nio/build.gradle

@@ -26,25 +26,11 @@ dependencies {
   testCompile "junit:junit:${versions.junit}"
   testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
 
-  if (isEclipse == false || project.path == ":libs:elasticsearch-nio-tests") {
-      testCompile(project(":test:framework")) {
-        exclude group: 'org.elasticsearch', module: 'elasticsearch-nio'
-      }
+  testCompile(project(":test:framework")) {
+     exclude group: 'org.elasticsearch', module: 'elasticsearch-nio'
   }
 }
 
-if (isEclipse) {
-  // in eclipse the project is under a fake root, we need to change around the source sets
-  sourceSets {
-    if (project.path == ":libs:elasticsearch-nio") {
-      main.java.srcDirs = ['java']
-      main.resources.srcDirs = ['resources']
-    } else {
-      test.java.srcDirs = ['java']
-      test.resources.srcDirs = ['resources']
-    }
-  }
-}
 
 forbiddenApisMain {
   // nio does not depend on core, so only jdk signatures should be checked

libs/secure-sm/build.gradle

@@ -25,31 +25,16 @@ dependencies {
     testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
     testCompile "junit:junit:${versions.junit}"
     testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
-
-    if (isEclipse == false || project.path == ":libs:elasticsearch-secure-sm-tests") {
-        testCompile(project(":test:framework")) {
-            exclude group: 'org.elasticsearch', module: 'elasticsearch-secure-sm'
-        }
+
+    testCompile(project(":test:framework")) {
+        exclude group: 'org.elasticsearch', module: 'elasticsearch-secure-sm'
     }
 }
 
 forbiddenApisMain {
     replaceSignatureFiles 'jdk-signatures'
 }
 
-if (isEclipse) {
-    // in Eclipse the project is under a fake root so we need to change around the source sets
-    sourceSets {
-        if (project.path == ":libs:elasticsearch-secure-sm") {
-            main.java.srcDirs = ['java']
-            main.resources.srcDirs = ['resources']
-        } else {
-            test.java.srcDirs = ['java']
-            test.resources.srcDirs = ['resources']
-        }
-    }
-}
-
 // JAR hell is part of core which we do not want to add as a dependency
 jarHell.enabled = false