Skip to content

Commit 9ddba6f

Browse files
committed
Removing and cleaning up build conditionals introduced before lucene/solr repo split.
1 parent b96c39f commit 9ddba6f

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

gradle/documentation/changes-to-html.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
def resources = scriptResources(buildscript)
1919

20-
configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path == ':solr:documentation' }) {
20+
configure(project(':solr:documentation')) {
2121
task changesToHtml(type: ChangesToHtmlTask) {
2222
siteDir = resources
2323
script = file("${resources}/changes2html.pl")

gradle/documentation/documentation.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ configure(rootProject) {
6767
}
6868

6969
// docroot will point to Lucene and Solr relative directory for each sub-project.
70-
configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path == ':solr:documentation' }) {
71-
70+
configure(project(':solr:documentation')) {
7271
ext {
7372
docroot = file("${buildDir}/site")
7473
docrootMinimal = file("${buildDir}/minimalSite")

gradle/documentation/markdown.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ buildscript {
4040
}
4141
}
4242

43-
configure(subprojects.findAll { it.path == ':lucene:documentation' || it.path == ':solr:documentation' }) {
43+
configure(project(':solr:documentation')) {
4444
task markdownToHtml(type: Copy) {
4545
dependsOn copyDocumentationAssets
4646

gradle/documentation/render-javadoc.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def javaJavadocPackages = rootProject.file("${resources}/java11/")
8282
def junitJavadocPackages = rootProject.file("${resources}/junit/")
8383
allprojects {
8484
project.tasks.withType(RenderJavadocTask) {
85-
title = "${project.path.startsWith(':lucene') ? 'Lucene' : 'Solr'} ${project.version} ${project.name} API"
85+
title = "Solr ${project.version} ${project.name} API"
8686

8787
offlineLinks += [
8888
"https://docs.oracle.com/en/java/javase/11/docs/api/": javaJavadocPackages,
@@ -260,7 +260,7 @@ class RenderJavadocTask extends DefaultTask {
260260
def opts = []
261261
opts << [ '-overview', project.file("${srcDirs[0]}/overview.html") ]
262262
opts << [ '-sourcepath', srcDirs.join(File.pathSeparator) ]
263-
opts << [ '-subpackages', project.path.startsWith(':lucene') ? 'org.apache.lucene' : 'org.apache.solr' ]
263+
opts << [ '-subpackages', 'org.apache.solr' ]
264264
opts << [ '-d', outputDir ]
265265
opts << '-protected'
266266
opts << [ '-encoding', 'UTF-8' ]

gradle/validation/check-broken-links.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ configure(rootProject) {
2020
group 'Verification'
2121
description 'Check broken links in the entire documentation'
2222

23-
dependsOn ':lucene:documentation:checkBrokenLinks'
2423
dependsOn ':solr:documentation:checkBrokenLinks'
2524
}
2625
}
2726

28-
configure(subprojects.findAll { it.path in [':lucene:documentation', ':solr:documentation'] }) {
27+
configure(project(':solr:documentation')) {
2928
task checkBrokenLinks(type: CheckBrokenLinksTask, 'dependsOn': 'documentation')
3029
check.dependsOn checkBrokenLinks
3130
}

0 commit comments

Comments
 (0)