Skip to content

Commit

Permalink
SOLR-15263: Use 'remote' URLs for lucene javadocs in ref-guide
Browse files Browse the repository at this point in the history
This allows us to re-enable the checkLocalJavadocLinksSite task, and in theory will point to the 'correct' URLs once 9.0 comes out, but there are longer term fixes still needed (see SOLR-15262)
  • Loading branch information
hossman committed Mar 15, 2021
1 parent 5eefa79 commit ef918e3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 26 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ 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-tlp-migration/disable-links-checking.gradle')

apply from: file('gradle/solr/packaging.gradle') // SOLR ONLY
apply from: file('gradle/solr/solr-forbidden-apis.gradle') // SOLR ONLY
Expand Down
23 changes: 0 additions & 23 deletions gradle/solr-tlp-migration/disable-links-checking.gradle

This file was deleted.

5 changes: 3 additions & 2 deletions solr/solr-ref-guide/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ ext {
desc: 'HTML Site for publishing to the Solr website',
props: [
htmlSolrJavadocs: "https://lucene.apache.org/solr/${solrGuideVersionPath}_0/",
// TODO: This isn't viable long term - see SOLR-15262 / SOLR-15264
htmlLuceneJavadocs: "https://lucene.apache.org/core/${solrGuideVersionPath}_0/"
]
]
Expand All @@ -132,8 +133,8 @@ ext {
// NOTE: extra '../' because we'll in a sub-dir of buildDir that will be built later...
props: [
htmlSolrJavadocs : 'link:../' + buildDir.toPath().relativize(project(':solr:documentation').docroot.toPath()).toString().replace(File.separator, '/'),
// TODO: decide what to do with lucene javadocs
htmlLuceneJavadocs : 'link:../'
// TODO: This isn't viable long term - see SOLR-15262 / SOLR-15264
htmlLuceneJavadocs : "https://lucene.apache.org/core/${solrGuideVersionPath}_0/"
]
]
}
Expand Down

0 comments on commit ef918e3

Please sign in to comment.