Apache Solr open-source search software
Removing and cleaning up build conditionals introduced before lucene/solr repo split.
Dawid Weisse8c0b705fcff
diff --git a/build.gradle b/build.gradleindex 2f48eb5e6f2..a6f8059c808 100644--- a/build.gradle+++ b/build.gradle@@ -54,9 +54,6 @@ allprojects {}ext {- skipSolr = (System.getProperty("skip.solr") as Boolean)- skipLucene = (System.getProperty("skip.lucene") as Boolean)-// "base" version is stripped of the qualifier. Compute it.baseVersion = {def m = (version =~ /^(\d+\.\d+\.\d+)(-(.+))?/)@@ -115,9 +112,7 @@ apply from: file('gradle/generate-defaults.gradle')// Ant-compatibility layer: apply folder layout early so that// evaluation of other scripts doesn't need to be deferred.apply from: file('gradle/ant-compat/folder-layout.gradle')-if (!skipSolr) {- apply from: file('gradle/ant-compat/solr.folder-layout.gradle') // SOLR ONLY-}+apply from: file('gradle/ant-compat/solr.folder-layout.gradle')// Set up defaults and configure aspects for certain modules or functionality// (java, tests)@@ -152,9 +147,7 @@ apply from: file('gradle/validation/gradlew-scripts-tweaked.gradle')apply from: file('gradle/validation/validate-log-calls.gradle')apply from: file('gradle/validation/check-broken-links.gradle')-if (!skipSolr) {- apply from: file('gradle/validation/solr.config-file-sanity.gradle') // SOLR ONLY-}+apply from: file('gradle/validation/solr.config-file-sanity.gradle')// Source or data regeneration tasksapply from: file('gradle/generation/javacc.gradle')@@ -176,8 +169,8 @@ apply from: file('gradle/help.gradle')// of potential problems with the build conventions, dependencies, etc.apply from: file('gradle/ant-compat/misc.gradle')-apply from: file('gradle/ant-compat/force-versions.gradle') // SOLR ONLY-apply from: file('gradle/ant-compat/artifact-naming.gradle') // SOLR ONLY+apply from: file('gradle/ant-compat/force-versions.gradle')+apply from: file('gradle/ant-compat/artifact-naming.gradle')apply from: file('gradle/documentation/documentation.gradle')apply from: file('gradle/documentation/changes-to-html.gradle')@@ -185,14 +178,14 @@ apply from: file('gradle/documentation/markdown.gradle')apply from: file('gradle/documentation/render-javadoc.gradle')apply from: file('gradle/hacks/gradle-archives.gradle')-apply from: file('gradle/hacks/solr.findbugs.gradle') // SOLR ONLY+apply from: file('gradle/hacks/solr.findbugs.gradle')apply from: file('gradle/hacks/gradle.gradle')apply from: file('gradle/hacks/hashmapAssertions.gradle')apply from: file('gradle/solr-tlp-migration/inaccessible-test-sources.gradle')-apply from: file('gradle/solr/packaging.gradle') // SOLR ONLY-apply from: file('gradle/solr/solr-forbidden-apis.gradle') // SOLR ONLY+apply from: file('gradle/solr/packaging.gradle')+apply from: file('gradle/solr/solr-forbidden-apis.gradle')-apply from: file('gradle/ant-compat/solr.post-jar.gradle') // SOLR ONLY+apply from: file('gradle/ant-compat/solr.post-jar.gradle')diff --git a/gradle/documentation/documentation.gradle b/gradle/documentation/documentation.gradleindex 0b41e585fc6..db492dce302 100644--- a/gradle/documentation/documentation.gradle+++ b/gradle/documentation/documentation.gradle@@ -34,20 +34,17 @@ configure(rootProject) {luceneDocVersion = "9_0_0-SNAPSHOT"luceneDocUrl = project.propertyOrDefault('lucene.javadoc.url', "https://lucene.apache.org/core/${luceneDocVersion}")- // SOLR ONLY- if (!skipSolr) {- solrDocUrl = project.propertyOrDefault('solr.javadoc.url', {- if (project.version != project.baseVersion) {- // non-release build- new File(project('solr:documentation').buildDir, 'site').toURI().toASCIIString().minus(~'/$')- } else {- // release build- "https://solr.apache.org/docs/${urlVersion}"- }- }())-- solrRefguideUrl = project.propertyOrDefault('solr.refguide.url', "https://lucene.apache.org/solr/guide/${refguideUrlVersion}")- }+ solrDocUrl = project.propertyOrDefault('solr.javadoc.url', {+ if (project.version != project.baseVersion) {+ // non-release build+ new File(project('solr:documentation').buildDir, 'site').toURI().toASCIIString().minus(~'/$')+ } else {+ // release build+ "https://solr.apache.org/docs/${urlVersion}"+ }+ }())++ solrRefguideUrl = project.propertyOrDefault('solr.refguide.url', "https://lucene.apache.org/solr/guide/${refguideUrlVersion}")}task documentation() {@@ -112,40 +109,37 @@ configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path ==}}-// SOLR ONLY-if (!skipSolr) {- configure(project(':solr:documentation')) {- task documentationMinimal() {- group = 'documentation'- description = "Generate stub Solr documentation pointing to web page (that's part of Solr TGZ)"- dependsOn 'copyMiniDocumentationAssets', 'createMiniDocumentationIndex', 'copyChangesToHtmlForMiniSite'- }+configure(project(':solr:documentation')) {+ task documentationMinimal() {+ group = 'documentation'+ description = "Generate stub Solr documentation pointing to web page (that's part of Solr TGZ)"+ dependsOn 'copyMiniDocumentationAssets', 'createMiniDocumentationIndex', 'copyChangesToHtmlForMiniSite'+ }- task copyChangesToHtmlForMiniSite(type: Copy) {- from project.docroot- into project.docrootMinimal- include 'changes/**'- dependsOn 'changesToHtml'- }+ task copyChangesToHtmlForMiniSite(type: Copy) {+ from project.docroot+ into project.docrootMinimal+ include 'changes/**'+ dependsOn 'changesToHtml'+ }- task copyMiniDocumentationAssets(type: Copy) {- includeEmptyDirs = false- from('src/assets')- into project.docrootMinimal- }+ task copyMiniDocumentationAssets(type: Copy) {+ includeEmptyDirs = false+ from('src/assets')+ into project.docrootMinimal+ }- assemble {- dependsOn documentationMinimal- }+ assemble {+ dependsOn documentationMinimal+ }- configurations {- minimalSite- }+ configurations {+ minimalSite+ }- artifacts {- minimalSite project.docrootMinimal, {- builtBy documentationMinimal- }+ artifacts {+ minimalSite project.docrootMinimal, {+ builtBy documentationMinimal}}}diff --git a/gradle/documentation/markdown.gradle b/gradle/documentation/markdown.gradleindex a52beb776a9..40ddf5d65cd 100644--- a/gradle/documentation/markdown.gradle+++ b/gradle/documentation/markdown.gradle@@ -52,38 +52,35 @@ configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path ==}}-// SOLR ONLY-if (!skipSolr) {- configure(project(':solr:documentation')) {- markdownToHtml {- from(project.markdownSrc) {- include '**/*.md'- exclude '**/*.template.md'- }+configure(project(':solr:documentation')) {+ markdownToHtml {+ from(project.markdownSrc) {+ include '**/*.md'+ exclude '**/*.template.md'}+ }- task createDocumentationIndex(type: MarkdownTemplateTask) {- dependsOn markdownToHtml+ task createDocumentationIndex(type: MarkdownTemplateTask) {+ dependsOn markdownToHtml- outputFile = file("${project.docroot}/index.html")- templateFile = file("${project.markdownSrc}/index.template.md")+ outputFile = file("${project.docroot}/index.html")+ templateFile = file("${project.markdownSrc}/index.template.md")- // list all properties used by the template here to allow uptodate checks to be correct:- inputs.property('version', project.version)- inputs.property('solrRefguideUrl', project.solrRefguideUrl)- inputs.property('luceneDocUrl', project.luceneDocUrl)+ // list all properties used by the template here to allow uptodate checks to be correct:+ inputs.property('version', project.version)+ inputs.property('solrRefguideUrl', project.solrRefguideUrl)+ inputs.property('luceneDocUrl', project.luceneDocUrl)- withProjectList()- }+ withProjectList()+ }- task createMiniDocumentationIndex(type: MarkdownTemplateTask) {- outputFile = file("${project.docrootMinimal}/index.html")- templateFile = file("${project.markdownSrc}/online-link.template.md")+ task createMiniDocumentationIndex(type: MarkdownTemplateTask) {+ outputFile = file("${project.docrootMinimal}/index.html")+ templateFile = file("${project.markdownSrc}/online-link.template.md")- // list all properties used by the template here to allow uptodate checks to be correct:- inputs.property('version', project.version)- inputs.property('solrDocUrl', project.solrDocUrl)- }+ // list all properties used by the template here to allow uptodate checks to be correct:+ inputs.property('version', project.version)+ inputs.property('solrDocUrl', project.solrDocUrl)}}diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradleindex ef53cfdf8f7..0ab9fcf002e 100644--- a/gradle/documentation/render-javadoc.gradle+++ b/gradle/documentation/render-javadoc.gradle@@ -97,62 +97,60 @@ allprojects {// Configure project-specific tweaks and to-dos.-if (!skipSolr) {- configure(project(":solr").allprojects) {- project.tasks.withType(RenderJavadocTask) {- // TODO: fix missing javadocs- javadocMissingLevel = "package"- }+configure(project(":solr").allprojects) {+ project.tasks.withType(RenderJavadocTask) {+ // TODO: fix missing javadocs+ javadocMissingLevel = "package"}+}- configure(project(":solr:contrib:analysis-extras")) {- project.tasks.withType(RenderJavadocTask) {- // TODO: clean up split packages- javadocMissingIgnore = [- "org.apache.solr.schema",- "org.apache.solr.update.processor"- ]- }+configure(project(":solr:contrib:analysis-extras")) {+ project.tasks.withType(RenderJavadocTask) {+ // TODO: clean up split packages+ javadocMissingIgnore = [+ "org.apache.solr.schema",+ "org.apache.solr.update.processor"+ ]}+}- configure(project(":solr:contrib:analytics")) {- project.tasks.withType(RenderJavadocTask) {- // TODO: clean up split packages- javadocMissingIgnore = [- "org.apache.solr.handler",- "org.apache.solr.handler.component",- "org.apache.solr.response"- ]- }+configure(project(":solr:contrib:analytics")) {+ project.tasks.withType(RenderJavadocTask) {+ // TODO: clean up split packages+ javadocMissingIgnore = [+ "org.apache.solr.handler",+ "org.apache.solr.handler.component",+ "org.apache.solr.response"+ ]}+}- configure(project(":solr:contrib:langid")) {- project.tasks.withType(RenderJavadocTask) {- // TODO: clean up split packages- javadocMissingIgnore = ["org.apache.solr.update.processor"]- }+configure(project(":solr:contrib:langid")) {+ project.tasks.withType(RenderJavadocTask) {+ // TODO: clean up split packages+ javadocMissingIgnore = ["org.apache.solr.update.processor"]}+}- configure(project(":solr:solrj")) {- project.tasks.withType(RenderJavadocTask) {- // TODO: clean up split packages- javadocMissingIgnore = ["org.apache.solr.client.solrj.embedded"]- }+configure(project(":solr:solrj")) {+ project.tasks.withType(RenderJavadocTask) {+ // TODO: clean up split packages+ javadocMissingIgnore = ["org.apache.solr.client.solrj.embedded"]}+}- configure(project(":solr:test-framework")) {- project.tasks.withType(RenderJavadocTask) {- // TODO: clean up split packages- javadocMissingIgnore = [- "org.apache.solr",- "org.apache.solr.analysis",- "org.apache.solr.cloud",- "org.apache.solr.core",- "org.apache.solr.handler.component",- "org.apache.solr.update.processor",- "org.apache.solr.util"- ]- }+configure(project(":solr:test-framework")) {+ project.tasks.withType(RenderJavadocTask) {+ // TODO: clean up split packages+ javadocMissingIgnore = [+ "org.apache.solr",+ "org.apache.solr.analysis",+ "org.apache.solr.cloud",+ "org.apache.solr.core",+ "org.apache.solr.handler.component",+ "org.apache.solr.update.processor",+ "org.apache.solr.util"+ ]}}@@ -161,16 +159,14 @@ if (!skipSolr) {// See: https://issues.apache.org/jira/browse/LUCENE-8738?focusedCommentId=16818106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16818106// Disable Javadoc rendering for these projects.-if (!skipSolr) {- configure(subprojects.findAll {- it.path in [- ':solr:solr-ref-guide',- ':solr:server',- ':solr:webapp']- }) {- project.tasks.withType(RenderJavadocTask) {- enabled = false- }+configure(subprojects.findAll {+ it.path in [+ ':solr:solr-ref-guide',+ ':solr:server',+ ':solr:webapp']+}) {+ project.tasks.withType(RenderJavadocTask) {+ enabled = false}}@@ -217,9 +213,8 @@ class RenderJavadocTask extends DefaultTask {@Inputdef luceneDocUrl = "${-> project.luceneDocUrl }"- // SOLR ONLY@Input- def solrDocUrl = "${-> project.skipSolr ? null : project.solrDocUrl }"+ def solrDocUrl = "${-> project.solrDocUrl }"// default is to require full javadocs@Inputdiff --git a/gradle/generation/javacc.gradle b/gradle/generation/javacc.gradleindex dd311458e0d..68bd0c9c6c8 100644--- a/gradle/generation/javacc.gradle+++ b/gradle/generation/javacc.gradle@@ -100,36 +100,33 @@ def commonCleanups = { FileTree generatedFiles ->}}-if (!skipSolr) {- configure(project(":solr:core")) {- task javacc(type: JavaCCTask) {- description "Regenerate Solr query parser"- group "generation"-- javaccFile = file('src/java/org/apache/solr/parser/QueryParser.jj')-- afterGenerate << commonCleanups- afterGenerate << { FileTree generatedFiles ->- generatedFiles.matching { include "QueryParser.java" }.each { file ->- modifyFile(file, { text ->- text = text.replace(- "public QueryParser(CharStream ",- "protected QueryParser(CharStream ")- text = text.replace(- "public QueryParser(QueryParserTokenManager ",- "protected QueryParser(QueryParserTokenManager ")- text = text.replace(- "final private LookaheadSuccess jj_ls =",- "static final private LookaheadSuccess jj_ls =")- return text- })- }+configure(project(":solr:core")) {+ task javacc(type: JavaCCTask) {+ description "Regenerate Solr query parser"+ group "generation"++ javaccFile = file('src/java/org/apache/solr/parser/QueryParser.jj')++ afterGenerate << commonCleanups+ afterGenerate << { FileTree generatedFiles ->+ generatedFiles.matching { include "QueryParser.java" }.each { file ->+ modifyFile(file, { text ->+ text = text.replace(+ "public QueryParser(CharStream ",+ "protected QueryParser(CharStream ")+ text = text.replace(+ "public QueryParser(QueryParserTokenManager ",+ "protected QueryParser(QueryParserTokenManager ")+ text = text.replace(+ "final private LookaheadSuccess jj_ls =",+ "static final private LookaheadSuccess jj_ls =")+ return text+ })}}}}-// We always regenerate, no need to declare outputs.class JavaCCTask extends DefaultTask {@Inputdiff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradleindex 0d72985202f..9fb3d880609 100644--- a/gradle/validation/ecj-lint.gradle+++ b/gradle/validation/ecj-lint.gradle@@ -106,13 +106,10 @@ allprojects {}}-// SOLR ONLY-if (!skipSolr) {// This excludes solr-ref-guide from the check (excludes are not taken into account// and linting of the ant-based task fails.- configure(project(":solr:solr-ref-guide")) {- afterEvaluate {- project.tasks.findByPath("ecjLintMain").enabled = false- }+configure(project(":solr:solr-ref-guide")) {+ afterEvaluate {+ project.tasks.findByPath("ecjLintMain").enabled = false}-}\ No newline at end of file+}diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradleindex 2b9c5e3e58a..060bb5c00ed 100644--- a/gradle/validation/jar-checks.gradle+++ b/gradle/validation/jar-checks.gradle@@ -39,10 +39,8 @@ buildscript {// Configure license checksum folder for top-level projects.// (The file("licenses") inside the configure scope resolves// relative to the current project so they're not the same).-if (!skipSolr) {- configure(project(":solr")) {- ext.licensesDir = file("licenses")- }+configure(project(":solr")) {+ ext.licensesDir = file("licenses")}// All known license types. If 'noticeOptional' is true then@@ -273,9 +271,7 @@ subprojects {// Add top-project level tasks validating dangling files// and regenerating dependency checksums.def plist = []-if (!skipSolr) {- plist.add(project(":solr"))-}+plist.add(project(":solr"))configure(plist) {def validationTasks = subprojects.collectMany { it.tasks.matching { it.name == "licenses" } }@@ -367,22 +363,19 @@ configure(plist) {// It would be probably better to move non-dependency licenses into the actual project// where they're used and only assemble them for the distribution package.-// SOLR ONLY-if (!skipSolr) {- configure(project(":solr")) {- checkDanglingLicenseFiles {- exclude += [- "README.committers.txt"- ]- }+configure(project(":solr")) {+ checkDanglingLicenseFiles {+ exclude += [+ "README.committers.txt"+ ]}+}- // solr-ref-guide doesn't contribute any JARs to dependency checks.- configure(project(":solr:solr-ref-guide")) {- configurations {- jarValidation {- exclude group: "*"- }+// solr-ref-guide doesn't contribute any JARs to dependency checks.+configure(project(":solr:solr-ref-guide")) {+ configurations {+ jarValidation {+ exclude group: "*"}}}\ No newline at end of filediff --git a/gradle/validation/precommit.gradle b/gradle/validation/precommit.gradleindex 8b5f1613ad4..8c2fe6cfd98 100644--- a/gradle/validation/precommit.gradle+++ b/gradle/validation/precommit.gradle@@ -27,11 +27,8 @@ configure(rootProject) {dependsOn ":versionsPropsAreSorted"dependsOn ":checkWorkingCopyClean"- // SOLR ONLY- if (!skipSolr) {- // Solr validation tasks.- dependsOn ":solr:validateConfigFileSanity"- }+ // Solr validation tasks.+ dependsOn ":solr:validateConfigFileSanity"// Attach all these tasks from all projects that have them.// This uses lazy collections as they may not yet be defined.diff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradleindex eca2a60b87a..41a6e783cc3 100644--- a/gradle/validation/rat-sources.gradle+++ b/gradle/validation/rat-sources.gradle@@ -49,26 +49,23 @@ configure(rootProject) {}}-// SOLR ONLY-if (!skipSolr) {- configure(project(":solr:core")) {- rat {- srcExcludes += [- "**/htmlStripReaderTest.html"- ]- }+configure(project(":solr:core")) {+ rat {+ srcExcludes += [+ "**/htmlStripReaderTest.html"+ ]}+}- configure(project(":solr:webapp")) {- rat {- includes = ["**"]- excludes += [- "web/img/**",- "*.iml",- "build.gradle",- "build/**",- ]- }+configure(project(":solr:webapp")) {+ rat {+ includes = ["**"]+ excludes += [+ "web/img/**",+ "*.iml",+ "build.gradle",+ "build/**",+ ]}}diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradleindex cf5cfe1e59e..31124676a91 100644--- a/gradle/validation/validate-source-patterns.gradle+++ b/gradle/validation/validate-source-patterns.gradle@@ -88,13 +88,10 @@ subprojects {check.dependsOn validateSourcePatterns}-// SOLR ONLY-if (!skipSolr) {- configure(project(':solr:core')) {- project.tasks.withType(ValidateSourcePatternsTask) {- sourceFiles.exclude 'src/**/CheckLoggingConfiguration.java'- sourceFiles.exclude 'src/test/org/apache/hadoop/**'- }+configure(project(':solr:core')) {+ project.tasks.withType(ValidateSourcePatternsTask) {+ sourceFiles.exclude 'src/**/CheckLoggingConfiguration.java'+ sourceFiles.exclude 'src/test/org/apache/hadoop/**'}}@@ -120,10 +117,6 @@ configure(rootProject) {exclude "${it}/**"}- if (skipSolr) {- exclude "solr/**"- }-// default excludes.exclude '**/build/**'exclude 'dev-tools/missing-doclet/src/**/*.java' // <-- TODO: remove once we allow "var" on master