This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 2f2cbba SOLR-15654: Build file cleanups (skip.solr references,
duplicated composite build identifier) (#308)
2f2cbba is described below
commit 2f2cbbaebf22dee47224b93e6abdf5e679f29f83
Author: Dawid Weiss <[email protected]>
AuthorDate: Mon Sep 27 12:48:56 2021 +0200
SOLR-15654: Build file cleanups (skip.solr references, duplicated composite
build identifier) (#308)
---
.../build.gradle | 0
.../settings.gradle | 1 +
.../apache/lucene/missingdoclet/MissingDoclet.java | 0
gradle/validation/rat-sources.gradle | 2 +-
gradle/validation/validate-source-patterns.gradle | 2 +-
settings.gradle | 48 +++++++++++-----------
6 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/dev-tools/missing-doclet/build.gradle
b/dev-tools/solr-missing-doclet/build.gradle
similarity index 100%
rename from dev-tools/missing-doclet/build.gradle
rename to dev-tools/solr-missing-doclet/build.gradle
diff --git a/dev-tools/missing-doclet/settings.gradle
b/dev-tools/solr-missing-doclet/settings.gradle
similarity index 95%
rename from dev-tools/missing-doclet/settings.gradle
rename to dev-tools/solr-missing-doclet/settings.gradle
index 6a9c064..73d6963 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.java
similarity index 100%
rename from
dev-tools/missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.java
rename to
dev-tools/solr-missing-doclet/src/main/java/org/apache/lucene/missingdoclet/MissingDoclet.java
diff --git a/gradle/validation/rat-sources.gradle
b/gradle/validation/rat-sources.gradle
index 9acd0dc..c422ba8 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/**"
break
case ":solr:contrib:clustering":
diff --git a/gradle/validation/validate-source-patterns.gradle
b/gradle/validation/validate-source-patterns.gradle
index f48fcb8..bcbde4a 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.gradle
index a17e3ed..58c8d00 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"
