Apache Lucene open-source search software
Renamed :lucene:build-tools into actual path in the project. Majority cherry picked from the patch by @kaivalnp #15240 (#15241)
Dawid Weiss8defe9316f36
diff --git a/build-tools/build-infra/src/main/groovy/lucene.documentation.render-javadoc.gradle b/build-tools/build-infra/src/main/groovy/lucene.documentation.render-javadoc.gradleindex 0a3b0bc544a..e53c4e8f594 100644--- a/build-tools/build-infra/src/main/groovy/lucene.documentation.render-javadoc.gradle+++ b/build-tools/build-infra/src/main/groovy/lucene.documentation.render-javadoc.gradle@@ -31,7 +31,7 @@ allprojects {}dependencies {- missingdoclet project(":lucene:build-tools:missing-doclet")+ missingdoclet project(":build-tools:missing-doclet")}project.ext {diff --git a/build-tools/build-infra/src/main/groovy/lucene.publications.maven.gradle b/build-tools/build-infra/src/main/groovy/lucene.publications.maven.gradleindex 2cab4702392..c9cd7360ba1 100644--- a/build-tools/build-infra/src/main/groovy/lucene.publications.maven.gradle+++ b/build-tools/build-infra/src/main/groovy/lucene.publications.maven.gradle@@ -50,7 +50,7 @@ def mavenProjects = project(":lucene").subprojects.findAll {subproject ->// Exclude all subprojects that are modular test projects and those explicitly// excluded above.return !(subproject.path.endsWith(".tests")- || subproject.path.startsWith(":lucene:build-tools:")+ || subproject.path.startsWith(":build-tools:")|| subproject.path in excluded)}diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/ApplyForbiddenApisPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/ApplyForbiddenApisPlugin.javaindex 13e07f13117..f720bbe031a 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/ApplyForbiddenApisPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/ApplyForbiddenApisPlugin.java@@ -90,7 +90,7 @@ public class ApplyForbiddenApisPlugin extends LuceneGradlePlugin {String ruleGroup =switch (project.getPath()) {- case ":lucene:build-tools:build-infra-shadow" -> "main-build-infra";+ case ":build-tools:build-infra-shadow" -> "main-build-infra";default -> "main";};@@ -134,7 +134,7 @@ public class ApplyForbiddenApisPlugin extends LuceneGradlePlugin {var forbiddenApisMainTask = allForbiddenApisTasks.named("forbiddenApisMain");switch (project.getPath()) {- case ":lucene:build-tools:missing-doclet", ":lucene:build-tools:build-infra-shadow":+ case ":build-tools:missing-doclet", ":build-tools:build-infra-shadow":forbiddenApisMainTask.configure(task -> {task.getBundledSignatures().removeAll(Set.of("jdk-non-portable", "jdk-system-out"));diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavaFolderLayoutPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavaFolderLayoutPlugin.javaindex d5456e4b5d3..2094e4e8c1f 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavaFolderLayoutPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavaFolderLayoutPlugin.java@@ -42,7 +42,7 @@ public class JavaFolderLayoutPlugin extends LuceneGradlePlugin {// point build-infra-shadow's main sources at build-infra sources so that we can// reapply the build to ourselves.- if (project.getPath().equals(":lucene:build-tools:build-infra-shadow")+ if (project.getPath().equals(":build-tools:build-infra-shadow")&& !getLuceneBuildGlobals(project).getIntellijIdea().get().isIdea()) {mainSrcSet.java(srcSetDir -> {diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavacConfigurationPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavacConfigurationPlugin.javaindex ac140f3457a..039d8788960 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavacConfigurationPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/JavacConfigurationPlugin.java@@ -110,7 +110,7 @@ public class JavacConfigurationPlugin extends LuceneGradlePlugin {// we can't use this linter option// because of https://github.com/apache/lucene/issues/14941- if (project.getPath().equals(":lucene:build-tools:build-infra-shadow")) {+ if (project.getPath().equals(":build-tools:build-infra-shadow")) {compilerArgs.remove("-Xlint:path");}diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/misc/ConfigureLockFilePlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/misc/ConfigureLockFilePlugin.javaindex 60e9dd33732..ee4a8276995 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/misc/ConfigureLockFilePlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/misc/ConfigureLockFilePlugin.java@@ -39,7 +39,7 @@ public class ConfigureLockFilePlugin extends LuceneGradlePlugin {rootProject.allprojects(project -> {// We don't care about the build infra deps in the lock file.- if (project.getPath().equals(":lucene:build-tools:build-infra-shadow")) {+ if (project.getPath().equals(":build-tools:build-infra-shadow")) {return;}diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.javaindex 0a52628ef7b..d16300eb096 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.java@@ -81,7 +81,7 @@ public class GoogleJavaFormatPlugin extends LuceneGradlePlugin {t.configure(task -> {var srcTree =- project.getPath().equals(":lucene:build-tools:build-infra-shadow")+ project.getPath().equals(":build-tools:build-infra-shadow")? project.getRootProject().fileTree("build-tools/build-infra/src"): project.fileTree("src");diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GradleGroovyFormatPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GradleGroovyFormatPlugin.javaindex be57c4d4732..493ae480bd1 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GradleGroovyFormatPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GradleGroovyFormatPlugin.java@@ -66,13 +66,13 @@ public class GradleGroovyFormatPlugin extends LuceneGradlePlugin {task -> {task.mustRunAfter(List.of(- ":lucene:build-tools:build-infra-shadow:applyGoogleJavaFormat",- ":lucene:build-tools:build-infra-shadow:compileJava",- ":lucene:build-tools:build-infra-shadow:pluginDescriptors",- ":lucene:build-tools:build-infra-shadow:pluginUnderTestMetadata",- ":lucene:build-tools:missing-doclet:applyGoogleJavaFormat",- ":lucene:build-tools:missing-doclet:compileJava",- ":lucene:build-tools:missing-doclet:renderJavadoc"));+ ":build-tools:build-infra-shadow:applyGoogleJavaFormat",+ ":build-tools:build-infra-shadow:compileJava",+ ":build-tools:build-infra-shadow:pluginDescriptors",+ ":build-tools:build-infra-shadow:pluginUnderTestMetadata",+ ":build-tools:missing-doclet:applyGoogleJavaFormat",+ ":build-tools:missing-doclet:compileJava",+ ":build-tools:missing-doclet:renderJavadoc"));});tasks.named("tidy").configure(task -> task.dependsOn(":spotlessGradleScriptsApply"));diff --git a/settings.gradle b/settings.gradleindex 8717a4b71ea..c8d571b38ba 100644--- a/settings.gradle+++ b/settings.gradle@@ -89,9 +89,5 @@ include "lucene:spatial-test-fixtures"include "lucene:suggest"include "lucene:test-framework"-include "lucene:build-tools:missing-doclet"-include "lucene:build-tools:build-infra-shadow"--// tweak the physical path for build-tools.-project(":lucene:build-tools:missing-doclet").projectDir = file("build-tools/missing-doclet")-project(":lucene:build-tools:build-infra-shadow").projectDir = file("build-tools/build-infra-shadow")+include "build-tools:missing-doclet"+include "build-tools:build-infra-shadow"diff --git a/versions.lock b/versions.lockindex f566a3301f9..7d1a1291812 100644--- a/versions.lock+++ b/versions.lock@@ -28,29 +28,29 @@"test_dependencies" : {"com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3" : "129da9bf,refs=76","com.carrotsearch:procfork:1.0.6" : "b7ba1646,refs=2",- "com.github.ben-manes.caffeine:caffeine:3.0.5" : "7d2143da,refs=39",- "com.github.kevinstern:software-and-algorithms:1.0" : "7d2143da,refs=39",- "com.google.auto.service:auto-service-annotations:1.0.1" : "7d2143da,refs=39",- "com.google.auto.value:auto-value-annotations:1.9" : "7d2143da,refs=39",- "com.google.auto:auto-common:1.2.2" : "7d2143da,refs=39",- "com.google.code.findbugs:jsr305:3.0.2" : "7d2143da,refs=39",- "com.google.errorprone:error_prone_annotation:2.41.0" : "7d2143da,refs=39",- "com.google.errorprone:error_prone_annotations:2.41.0" : "7d2143da,refs=39",- "com.google.errorprone:error_prone_check_api:2.41.0" : "7d2143da,refs=39",- "com.google.errorprone:error_prone_core:2.41.0" : "7d2143da,refs=39",- "com.google.googlejavaformat:google-java-format:1.27.0" : "7d2143da,refs=39",- "com.google.guava:failureaccess:1.0.2" : "7d2143da,refs=39",- "com.google.guava:guava:33.4.0-jre" : "7d2143da,refs=39",- "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" : "7d2143da,refs=39",- "com.google.j2objc:j2objc-annotations:3.0.0" : "7d2143da,refs=39",- "com.google.protobuf:protobuf-java:3.25.5" : "7d2143da,refs=39",+ "com.github.ben-manes.caffeine:caffeine:3.0.5" : "90685606,refs=39",+ "com.github.kevinstern:software-and-algorithms:1.0" : "90685606,refs=39",+ "com.google.auto.service:auto-service-annotations:1.0.1" : "90685606,refs=39",+ "com.google.auto.value:auto-value-annotations:1.9" : "90685606,refs=39",+ "com.google.auto:auto-common:1.2.2" : "90685606,refs=39",+ "com.google.code.findbugs:jsr305:3.0.2" : "90685606,refs=39",+ "com.google.errorprone:error_prone_annotation:2.41.0" : "90685606,refs=39",+ "com.google.errorprone:error_prone_annotations:2.41.0" : "90685606,refs=39",+ "com.google.errorprone:error_prone_check_api:2.41.0" : "90685606,refs=39",+ "com.google.errorprone:error_prone_core:2.41.0" : "90685606,refs=39",+ "com.google.googlejavaformat:google-java-format:1.27.0" : "90685606,refs=39",+ "com.google.guava:failureaccess:1.0.2" : "90685606,refs=39",+ "com.google.guava:guava:33.4.0-jre" : "90685606,refs=39",+ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" : "90685606,refs=39",+ "com.google.j2objc:j2objc-annotations:3.0.0" : "90685606,refs=39",+ "com.google.protobuf:protobuf-java:3.25.5" : "90685606,refs=39","com.ibm.icu:icu4j:77.1" : "ffa00415,refs=8","commons-codec:commons-codec:1.19.0" : "9dde4cb5,refs=8","commons-io:commons-io:2.16.1" : "6f16ff86,refs=2",- "io.github.eisop:dataflow-errorprone:3.41.0-eisop1" : "7d2143da,refs=39",- "io.github.java-diff-utils:java-diff-utils:4.12" : "7d2143da,refs=39",+ "io.github.eisop:dataflow-errorprone:3.41.0-eisop1" : "90685606,refs=39",+ "io.github.java-diff-utils:java-diff-utils:4.12" : "90685606,refs=39","io.sgr:s2-geometry-library-java:1.0.0" : "1d5a4b2b,refs=4",- "javax.inject:javax.inject:1" : "7d2143da,refs=39",+ "javax.inject:javax.inject:1" : "90685606,refs=39","junit:junit:4.13.2" : "129da9bf,refs=76","net.bytebuddy:byte-buddy:1.15.11" : "b7ba1646,refs=2","net.sf.jopt-simple:jopt-simple:5.0.4" : "152d9f78,refs=3",@@ -64,14 +64,14 @@"org.carrot2:morfologik-fsa:2.1.9" : "e077a675,refs=8","org.carrot2:morfologik-polish:2.1.9" : "cb00cecf,refs=5","org.carrot2:morfologik-stemming:2.1.9" : "e077a675,refs=8",- "org.checkerframework:checker-qual:3.43.0" : "7d2143da,refs=39",+ "org.checkerframework:checker-qual:3.43.0" : "90685606,refs=39","org.hamcrest:hamcrest:3.0" : "129da9bf,refs=76",- "org.jspecify:jspecify:1.0.0" : "7d2143da,refs=39",+ "org.jspecify:jspecify:1.0.0" : "90685606,refs=39","org.locationtech.jts:jts-core:1.20.0" : "180518e6,refs=2","org.locationtech.spatial4j:spatial4j:0.8" : "1d5a4b2b,refs=4","org.openjdk.jmh:jmh-core:1.37" : "152d9f78,refs=3","org.openjdk.jmh:jmh-generator-annprocess:1.37" : "ecaf1d73,refs=1",- "org.pcollections:pcollections:4.0.1" : "7d2143da,refs=39",+ "org.pcollections:pcollections:4.0.1" : "90685606,refs=39","org.slf4j:slf4j-api:2.0.17" : "b91715f0,refs=6","ua.net.nlp:morfologik-ukrainian-search:4.9.1" : "cb00cecf,refs=5","xerces:xercesImpl:2.12.2" : "6f16ff86,refs=2"@@ -530,7 +530,21 @@"projectPath" : ":lucene:analysis:morfologik"}],- "7d2143da" : [+ "85a1e4c6" : [+ {+ "configuration" : "compileClasspath",+ "projectPath" : ":lucene:benchmark-jmh"+ },+ {+ "configuration" : "runtimeClasspath",+ "projectPath" : ":lucene:benchmark-jmh"+ }+ ],+ "90685606" : [+ {+ "configuration" : "annotationProcessor",+ "projectPath" : ":build-tools:missing-doclet"+ },{"configuration" : "annotationProcessor","projectPath" : ":lucene:analysis.tests"@@ -682,20 +696,6 @@{"configuration" : "annotationProcessor","projectPath" : ":lucene:analysis:stempel"- },- {- "configuration" : "annotationProcessor",- "projectPath" : ":lucene:build-tools:missing-doclet"- }- ],- "85a1e4c6" : [- {- "configuration" : "compileClasspath",- "projectPath" : ":lucene:benchmark-jmh"- },- {- "configuration" : "runtimeClasspath",- "projectPath" : ":lucene:benchmark-jmh"}],"9dde4cb5" : [