Revert "Fix eclipse for build tools (#73699) (7.x backport) (#73904)"

This reverts commit 3799abc

Author: mark-vieira

build-conventions/build.gradle

@@ -6,12 +6,9 @@
  * Side Public License, v 1.
  */
 
-import org.gradle.plugins.ide.eclipse.model.SourceFolder;
-
 plugins {
     id 'java-gradle-plugin'
     id 'java-test-fixtures'
-    id 'eclipse'
 }
 
 group = "org.elasticsearch"
@@ -28,10 +25,6 @@ gradlePlugin {
             id = 'elasticsearch.internal-licenseheaders'
             implementationClass = 'org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersPrecommitPlugin'
         }
-        eclipse {
-            id = 'elasticsearch.eclipse'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.EclipseConventionPlugin'
-        }
         publish {
             id = 'elasticsearch.publish'
             implementationClass = 'org.elasticsearch.gradle.internal.conventions.PublishPlugin'
@@ -57,19 +50,3 @@ dependencies {
     api 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0'
     api 'org.apache.rat:apache-rat:0.11'
 }
-
-project.getPlugins().withType(JavaBasePlugin.class, javaBasePlugin -> {
-    java.getModularity().getInferModulePath().set(false);
-    eclipse.getClasspath().getFile().whenMerged { classpath ->
-        /*
-         * give each source folder a unique corresponding output folder
-         * outside of the usual `build` folder. We can't put the build
-         * in the usual build folder because eclipse becomes *very* sad
-         * if we delete it. Which `gradlew clean` does all the time.
-         */
-        int i = 0;
-        classpath.getEntries().stream().filter(e -> e instanceof SourceFolder).forEachOrdered(s ->
-                s.setOutput("out/eclipse"+i++)
-        )
-    }
-})

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/EclipseConventionPlugin.java

@@ -9,18 +9,13 @@
 import org.gradle.internal.jvm.Jvm
 import org.gradle.util.GradleVersion
 import org.elasticsearch.gradle.internal.conventions.VersionPropertiesLoader
-import org.apache.tools.ant.taskdefs.condition.Os
-import org.gradle.plugins.ide.eclipse.model.AccessRule
-import org.gradle.plugins.ide.eclipse.model.SourceFolder
-import org.gradle.plugins.ide.eclipse.model.ProjectDependency
 
 plugins {
   id 'java-gradle-plugin'
   id 'groovy-gradle-plugin'
   id 'groovy'
   id 'elasticsearch.internal-licenseheaders'
   id 'elasticsearch.basic-build-tool-conventions'
-  id 'elasticsearch.eclipse'
 }
 
 group = 'org.elasticsearch.gradle'

build-tools-internal/build.gradle

@@ -22,13 +22,11 @@ description = "The elasticsearch build tools"
 // we write this back out below to load it in the Build.java which will be shown in rest main action
 // to indicate this being a snapshot build or a release build.
 Properties props = VersionPropertiesLoader.loadBuildSrcVersion(project.file('../build-tools-internal/version.properties'))
-
 allprojects {
     group = "org.elasticsearch"
     version = props.getProperty("elasticsearch")
 
     apply plugin: 'java'
-    apply plugin: 'elasticsearch.eclipse'
     targetCompatibility = 11
     sourceCompatibility = 11
 }
@@ -219,4 +217,4 @@ tasks.named("check").configure { dependsOn("integTest") }
 //        baseClass 'spock.lang.Specification'
 //      }
 //    }
-//  }
+//  }

build-tools/build.gradle

@@ -314,8 +314,42 @@ gradle.projectsEvaluated {
 
 // eclipse configuration
 allprojects {
-  apply plugin: 'elasticsearch.eclipse'
+  apply plugin: 'eclipse'
+  // Name all the non-root projects after their path so that paths get grouped together when imported into eclipse.
+  if (path != ':') {
+    eclipse.project.name = path
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+      eclipse.project.name = eclipse.project.name.replace(':', '_')
+    }
+  }
+
+  plugins.withType(JavaBasePlugin) {
+    java.modularity.inferModulePath.set(false)
+    eclipse.classpath.file.whenMerged { classpath ->
+      /*
+       * give each source folder a unique corresponding output folder
+       * outside of the usual `build` folder. We can't put the build
+       * in the usual build folder because eclipse becomes *very* sad
+       * if we delete it. Which `gradlew clean` does all the time.
+       */
+      int i = 0;
+      classpath.entries.findAll { it instanceof SourceFolder }.each { folder ->
+        i++;
+        folder.output = 'out/eclipse/' + i
+      }
 
+      // Starting with Gradle 6.7 test dependencies are not exposed by eclipse
+      // projects by default. This breaks project dependencies using the `java-test-fixtures` plugin
+      // or dependencies on other projects manually declared testArtifacts configurations
+      // This issue is tracked in gradle issue tracker.
+      // See https://github.com/gradle/gradle/issues/14932 for further details
+      classpath.entries.findAll {
+        it instanceof ProjectDependency
+      }.each {
+        it.entryAttributes.remove('without_test_code')
+      }
+    }
+  }
   /*
    * Allow accessing com/sun/net/httpserver in projects that have
    * configured forbidden apis to allow it.
@@ -331,6 +365,34 @@ allprojects {
       }
     }
   }
+
+  File licenseHeaderFile
+  String prefix = ':x-pack'
+  if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    prefix = prefix.replace(':', '_')
+  }
+  if (eclipse.project.name.startsWith(prefix)) {
+    licenseHeaderFile = new File(project.rootDir, 'build-tools-internal/src/main/resources/license-headers/elastic-license-2.0-header.txt')
+  } else {
+    licenseHeaderFile = new File(project.rootDir, 'build-tools-internal/src/main/resources/license-headers/sspl+elastic-license-header.txt')
+  }
+
+  String lineSeparator = Os.isFamily(Os.FAMILY_WINDOWS) ? '\\\\r\\\\n' : '\\\\n'
+  String licenseHeader = licenseHeaderFile.getText('UTF-8').replace(System.lineSeparator(), lineSeparator)
+  tasks.register('copyEclipseSettings', Copy) {
+    mustRunAfter 'wipeEclipseSettings'
+    // TODO: "package this up" for external builds
+    from new File(project.rootDir, 'build-tools-internal/src/main/resources/eclipse.settings')
+    into '.settings'
+    filter { it.replaceAll('@@LICENSE_HEADER_TEXT@@', licenseHeader) }
+  }
+  // otherwise .settings is not nuked entirely
+  tasks.register('wipeEclipseSettings', Delete) {
+    delete '.settings'
+  }
+  tasks.named('cleanEclipse') { dependsOn 'wipeEclipseSettings' }
+  // otherwise the eclipse merging is *super confusing*
+  tasks.named('eclipse') { dependsOn 'cleanEclipse', 'copyEclipseSettings' }
 }
 
 tasks.named("wrapper").configure {
@@ -439,18 +501,6 @@ tasks.named("assemble").configure {
   dependsOn gradle.includedBuild('build-tools').task(':assemble')
 }
 
-tasks.named("cleanEclipse").configure {
-  dependsOn gradle.includedBuild('build-conventions').task(':cleanEclipse')
-  dependsOn gradle.includedBuild('build-tools').task(':cleanEclipse')
-  dependsOn gradle.includedBuild('build-tools-internal').task(':cleanEclipse')
-}
-
-tasks.named("eclipse").configure {
-  dependsOn gradle.includedBuild('build-conventions').task(':eclipse')
-  dependsOn gradle.includedBuild('build-tools').task(':eclipse')
-  dependsOn gradle.includedBuild('build-tools-internal').task(':eclipse')
-}
-
 subprojects {
   project.ext.disableTasks = { String... tasknames ->
     for (String taskname : tasknames) {