Apache Lucene open-source search software
Fix eclipse ide settings generation (#13649)
Dawid Weiss1cfa697c06ad
diff --git a/build.gradle b/build.gradleindex 6705923d79d..1c7c5f817aa 100644--- a/build.gradle+++ b/build.gradle@@ -80,6 +80,9 @@ ext {// Minimum Java version required to compile and run Lucene.minJavaVersion = JavaVersion.toVersion(deps.versions.minJava.get())+ // also change this in extractor tool: ExtractForeignAPI+ vectorIncubatorJavaVersions = [ JavaVersion.VERSION_21, JavaVersion.VERSION_22 ] as Set+// snapshot build marker used in scripts.snapshotBuild = version.contains("SNAPSHOT")@@ -117,10 +120,6 @@ apply from: file('gradle/generation/local-settings.gradle')// Make sure the build environment is consistent.apply from: file('gradle/validation/check-environment.gradle')-// IDE support, settings and specials.-apply from: file('gradle/ide/intellij-idea.gradle')-apply from: file('gradle/ide/eclipse.gradle')-// Set up defaults and configure aspects for certain modules or functionality// (java, tests)apply from: file('gradle/java/folder-layout.gradle')@@ -133,6 +132,10 @@ apply from: file('gradle/testing/alternative-jdk-support.gradle')apply from: file('gradle/java/jar-manifest.gradle')apply from: file('gradle/java/modules.gradle')+// IDE support, settings and specials.+apply from: file('gradle/ide/intellij-idea.gradle')+apply from: file('gradle/ide/eclipse.gradle')+// Maven artifact publishing.apply from: file('gradle/maven/publications.gradle')diff --git a/gradle/generation/extract-jdk-apis.gradle b/gradle/generation/extract-jdk-apis.gradleindex 3c8e1efa447..3adde87da83 100644--- a/gradle/generation/extract-jdk-apis.gradle+++ b/gradle/generation/extract-jdk-apis.gradle@@ -17,13 +17,6 @@def resources = scriptResources(buildscript)-configure(rootProject) {- ext {- // also change this in extractor tool: ExtractForeignAPI- vectorIncubatorJavaVersions = [ JavaVersion.VERSION_21, JavaVersion.VERSION_22 ] as Set- }-}-configure(project(":lucene:core")) {ext {apijars = layout.projectDirectory.dir("src/generated/jdk")diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradleindex 8e5c44cff9d..7e115e4baaf 100644--- a/gradle/ide/eclipse.gradle+++ b/gradle/ide/eclipse.gradle@@ -22,10 +22,11 @@ import org.gradle.plugins.ide.eclipse.model.ClasspathEntrydef resources = scriptResources(buildscript)configure(rootProject) {- plugins.withType(JavaPlugin) {- apply plugin: "eclipse"+ if (gradle.startParameter.taskNames.contains("eclipse")) {+ project.pluginManager.apply("java-base")+ project.pluginManager.apply("eclipse")- def eclipseJavaVersion = propertyOrDefault("eclipse.javaVersion", rootProject.minJavaVersion)+ def eclipseJavaVersion = propertyOrDefault("eclipse.javaVersion", deps.versions.minJava.get())def relativize = { other -> rootProject.rootDir.relativePath(other).toString() }eclipse {@@ -105,9 +106,9 @@ configure(rootProject) {}}- eclipseJdt {+ eclipseJdt {enabled = false- dependsOn 'luceneEclipse'+ dependsOn 'luceneEclipseJdt'}eclipseClasspath {diff --git a/gradle/validation/dependencies.gradle b/gradle/validation/dependencies.gradleindex 43dcf7583b8..5d9cc2e8d4a 100644--- a/gradle/validation/dependencies.gradle+++ b/gradle/validation/dependencies.gradle@@ -75,6 +75,18 @@ configure(rootProject) {it.dependsOn(":versionCatalogFormatDeps")}+ // correct crlf/ default encoding after version catalog formatting finishes.+ tasks.matching {+ it.path in [+ ":versionCatalogFormatDeps"+ ]+ }.configureEach {+ it.doLast {+ ant.fixcrlf(file: it.catalogFile.get().asFile,+ eol: "lf", fixlast: "true", encoding: "UTF-8")+ }+ }+tasks.matching {it.path in [":versionCatalogUpdateDeps"diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 49a4da82b53..975d36092d9 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -253,6 +253,11 @@ Other* GITHUB#13499: Remove usage of TopScoreDocCollector + TopFieldCollector deprecated methods (#create, #createSharedManager) (Jakub Slowinski)+Build+---------------------++* GITHUB#13649: Fix eclipse ide settings generation #13649 (Uwe Schindler, Dawid Weiss)+======================== Lucene 9.12.0 =======================API Changes