Removing and cleaning up build conditionals introduced before lucene/…

…solr repo split.
apache · Mar 18, 2021 · 9ddba6f · 9ddba6f
1 parent b96c39f
commit 9ddba6f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
 }