Apache Solr open-source search software
SOLR-15654: Build file cleanups (skip.solr references, duplicated composite build identifier) (#308)
Dawid Weiss2f2cbbaebf22
diff --git a/dev-tools/missing-doclet/build.gradle b/dev-tools/solr-missing-doclet/build.gradlesimilarity index 100%rename from dev-tools/missing-doclet/build.gradlerename to dev-tools/solr-missing-doclet/build.gradlediff --git a/dev-tools/missing-doclet/settings.gradle b/dev-tools/solr-missing-doclet/settings.gradlesimilarity index 95%rename from dev-tools/missing-doclet/settings.gradlerename to dev-tools/solr-missing-doclet/settings.gradleindex 6a9c064171d..73d696331bc 100644--- a/dev-tools/missing-doclet/settings.gradle+++ b/dev-tools/solr-missing-doclet/settings.gradle@@ -15,3 +15,4 @@* limitations under the License.*/+rootProject.name = "missing-doclet"diff --git a/dev-tools/missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.java b/dev-tools/solr-missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.javasimilarity index 100%rename from dev-tools/missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.javarename to dev-tools/solr-missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.javadiff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradleindex 9acd0dc1328..c422ba8e3ec 100644--- a/gradle/validation/rat-sources.gradle+++ b/gradle/validation/rat-sources.gradle@@ -95,7 +95,7 @@ allprojects {// The root project also includes patterns for the boostrap (buildSrc) and composite// projects. Include their sources in the scan.include "buildSrc/src/**"- include "dev-tools/missing-doclet/src/**"+ include "dev-tools/solr-missing-doclet/src/**"breakcase ":solr:contrib:clustering":diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradleindex f48fcb840c1..bcbde4a176c 100644--- a/gradle/validation/validate-source-patterns.gradle+++ b/gradle/validation/validate-source-patterns.gradle@@ -115,7 +115,7 @@ configure(rootProject) {// default excludes.exclude '**/build/**'exclude '**/.idea/**'- exclude 'dev-tools/missing-doclet/src/**/*.java' // <-- TODO: remove once we allow "var" on master+ exclude 'dev-tools/solr-missing-doclet/src/**/*.java' // <-- TODO: remove once we allow "var" on master// ourselves :-)exclude 'gradle/validation/validate-source-patterns.gradle'diff --git a/settings.gradle b/settings.gradleindex a17e3ed9f3b..58c8d006312 100644--- a/settings.gradle+++ b/settings.gradle@@ -17,30 +17,28 @@rootProject.name = "solr-root"-includeBuild("dev-tools/missing-doclet")+includeBuild("dev-tools/solr-missing-doclet")-if (!(System.getProperty("skip.solr") as Boolean)) {- include "solr:solrj"- include "solr:core"- include "solr:server"- include "solr:contrib:analysis-extras"- include "solr:contrib:analytics"- include "solr:contrib:clustering"- include "solr:contrib:extraction"- include "solr:contrib:langid"- include "solr:contrib:jaegertracer-configurator"- include "solr:contrib:prometheus-exporter"- include "solr:contrib:s3-repository"- include "solr:contrib:scripting"- include "solr:contrib:ltr"- include "solr:contrib:gcs-repository"- include "solr:webapp"- include "solr:benchmark"- include "solr:test-framework"- include "solr:solr-ref-guide"- include "solr:example"+include "solr:solrj"+include "solr:core"+include "solr:server"+include "solr:contrib:analysis-extras"+include "solr:contrib:analytics"+include "solr:contrib:clustering"+include "solr:contrib:extraction"+include "solr:contrib:langid"+include "solr:contrib:jaegertracer-configurator"+include "solr:contrib:prometheus-exporter"+include "solr:contrib:s3-repository"+include "solr:contrib:scripting"+include "solr:contrib:ltr"+include "solr:contrib:gcs-repository"+include "solr:webapp"+include "solr:benchmark"+include "solr:test-framework"+include "solr:solr-ref-guide"+include "solr:example"- include "solr:documentation"- include "solr:packaging"- include "solr:docker"-}+include "solr:documentation"+include "solr:packaging"+include "solr:docker"