Apache Lucene open-source search software
Try to fix eclipse configuration after upgrading to gradle 9.1.0. #15250 (#15252)
Dawid Weiss2a68f37ab688
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.javaindex 535d6baa60e..77d9a377cde 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/ide/EclipseSupportPlugin.java@@ -32,7 +32,7 @@ import org.apache.lucene.gradle.plugins.java.EcjLintPlugin;import org.apache.tools.ant.filters.ReplaceTokens;import org.gradle.api.JavaVersion;import org.gradle.api.Project;-import org.gradle.api.artifacts.Configuration;+import org.gradle.api.artifacts.Dependency;import org.gradle.api.artifacts.VersionCatalog;import org.gradle.api.plugins.JavaPlugin;import org.gradle.api.plugins.JavaPluginExtension;@@ -44,7 +44,6 @@ import org.gradle.plugins.ide.eclipse.GenerateEclipseJdt;import org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry;import org.gradle.plugins.ide.eclipse.model.Classpath;import org.gradle.plugins.ide.eclipse.model.ClasspathEntry;-import org.gradle.plugins.ide.eclipse.model.EclipseClasspath;import org.gradle.plugins.ide.eclipse.model.EclipseModel;import org.gradle.plugins.ide.eclipse.model.SourceFolder;@@ -81,24 +80,6 @@ public class EclipseSupportPlugin extends LuceneGradlePlugin {var eclipse = project.getExtensions().getByType(EclipseModel.class);eclipse.getProject().setName("Apache Lucene " + project.getVersion());- var classpath = eclipse.getClasspath();- classpath.setDefaultOutputDir(project.file("build/eclipse"));- classpath.setDownloadJavadoc(false);- classpath.setDownloadSources(true);-- project- .getAllprojects()- .forEach(- p -> {- p.getPlugins()- .withType(JavaPlugin.class)- .configureEach(_ -> addDependencyConfigurations(p, classpath));- });-- classpath- .getFile()- .whenMerged(- cp -> configureClasspath(project, (org.gradle.plugins.ide.eclipse.model.Classpath) cp));var jdt = eclipse.getJdt();jdt.setSourceCompatibility(eclipseJavaVersion);@@ -172,23 +153,57 @@ public class EclipseSupportPlugin extends LuceneGradlePlugin {task.dependsOn(luceneEclipseJdt);});+ // Add gradle plugin portal to the source repository list and+ // apply any ecj source repository hackery the same way as everywhere.+ project.getRepositories().gradlePluginPortal();+ project.apply(conf -> conf.from(project.file("build-tools/build-infra/ecj-source.gradle")));+tasks.withType(GenerateEclipseClasspath.class).named("eclipseClasspath").configure(task -> {+ var classpath = task.getClasspath();+ classpath.setDefaultOutputDir(project.file("build/eclipse"));+ classpath.setDownloadJavadoc(false);+ classpath.setDownloadSources(true);++ // Collect dependencies from selected configurations+ // and copy them over to a local configuration.+ List<Dependency> subdependencies = new ArrayList<>();+ project+ .getAllprojects()+ .forEach(+ p -> {+ if (p.getPlugins().hasPlugin(JavaPlugin.class)) {+ subdependencies.addAll(+ p.getConfigurations()+ .getByName("compileClasspath")+ .getAllDependencies());+ subdependencies.addAll(+ p.getConfigurations()+ .getByName("testCompileClasspath")+ .getAllDependencies());+ }+ });++ var subconf =+ project+ .getConfigurations()+ .detachedConfiguration(subdependencies.toArray(Dependency[]::new));+ classpath.setPlusConfigurations(List.of(subconf));++ classpath+ .getFile()+ .whenMerged(+ cp ->+ configureClasspath(+ project, (org.gradle.plugins.ide.eclipse.model.Classpath) cp));+task.getInputs().property("eclipseJavaVersion", eclipseJavaVersion);});}- private static void addDependencyConfigurations(Project p, EclipseClasspath classpath) {- List<Configuration> newConfigurations = new ArrayList<>(classpath.getPlusConfigurations());- var conf = p.getConfigurations();- newConfigurations.add(conf.getByName("compileClasspath"));- newConfigurations.add(conf.getByName("testCompileClasspath"));- classpath.setPlusConfigurations(newConfigurations);- }-private void configureClasspath(Project project, Classpath cp) {// wipe references to sources and cross-project refs.cp.getEntries()