Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Removing and cleaning up build conditionals introduced before lucene/solr repo split.

Dawid Weiss9ddba6feadb9
diff --git a/gradle/documentation/changes-to-html.gradle b/gradle/documentation/changes-to-html.gradle
index f80a3ed7426..e9692ab69d9 100644
--- a/gradle/documentation/changes-to-html.gradle
+++ b/gradle/documentation/changes-to-html.gradle
@@ -17,7 +17,7 @@
def resources = scriptResources(buildscript)
-configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path == ':solr:documentation' }) {
+configure(project(':solr:documentation')) {
task changesToHtml(type: ChangesToHtmlTask) {
siteDir = resources
script = file("${resources}/changes2html.pl")
diff --git a/gradle/documentation/documentation.gradle b/gradle/documentation/documentation.gradle
index 08fea98a898..756234f29d2 100644
--- a/gradle/documentation/documentation.gradle
+++ b/gradle/documentation/documentation.gradle
@@ -67,8 +67,7 @@ configure(rootProject) {
}
// docroot will point to Lucene and Solr relative directory for each sub-project.
-configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path == ':solr:documentation' }) {
-
+configure(project(':solr:documentation')) {
ext {
docroot = file("${buildDir}/site")
docrootMinimal = file("${buildDir}/minimalSite")
diff --git a/gradle/documentation/markdown.gradle b/gradle/documentation/markdown.gradle
index 40ddf5d65cd..0f5bc3cc072 100644
--- a/gradle/documentation/markdown.gradle
+++ b/gradle/documentation/markdown.gradle
@@ -40,7 +40,7 @@ buildscript {
}
}
-configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path == ':solr:documentation' }) {
+configure(project(':solr:documentation')) {
task markdownToHtml(type: Copy) {
dependsOn copyDocumentationAssets
diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index 91b43f02663..5338ccacf68 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -82,7 +82,7 @@ def javaJavadocPackages = rootProject.file("${resources}/java11/")
def junitJavadocPackages = rootProject.file("${resources}/junit/")
allprojects {
project.tasks.withType(RenderJavadocTask) {
- title = "${project.path.startsWith(':lucene') ? 'Lucene' : 'Solr'} ${project.version} ${project.name} API"
+ title = "Solr ${project.version} ${project.name} API"
offlineLinks += [
"https://docs.oracle.com/en/java/javase/11/docs/api/": javaJavadocPackages,
@@ -260,7 +260,7 @@ class RenderJavadocTask extends DefaultTask {
def opts = []
opts << [ '-overview', project.file("${srcDirs[0]}/overview.html") ]
opts << [ '-sourcepath', srcDirs.join(File.pathSeparator) ]
- opts << [ '-subpackages', project.path.startsWith(':lucene') ? 'org.apache.lucene' : 'org.apache.solr' ]
+ opts << [ '-subpackages', 'org.apache.solr' ]
opts << [ '-d', outputDir ]
opts << '-protected'
opts << [ '-encoding', 'UTF-8' ]
diff --git a/gradle/validation/check-broken-links.gradle b/gradle/validation/check-broken-links.gradle
index a30999178ec..9aabcd3dd9f 100644
--- a/gradle/validation/check-broken-links.gradle
+++ b/gradle/validation/check-broken-links.gradle
@@ -20,12 +20,11 @@ configure(rootProject) {
group 'Verification'
description 'Check broken links in the entire documentation'
- dependsOn ':lucene:documentation:checkBrokenLinks'
dependsOn ':solr:documentation:checkBrokenLinks'
}
}
-configure(subprojects.findAll { it.path in [':lucene:documentation', ':solr:documentation'] }) {
+configure(project(':solr:documentation')) {
task checkBrokenLinks(type: CheckBrokenLinksTask, 'dependsOn': 'documentation')
check.dependsOn checkBrokenLinks
}