Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15263: Use 'remote' URLs for lucene javadocs in ref-guide

Chris Hostetteref918e3de4e2
diff --git a/build.gradle b/build.gradle
index b50ccf9f15f..2f48eb5e6f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
diff --git a/gradle/solr-tlp-migration/disable-links-checking.gradle b/gradle/solr-tlp-migration/disable-links-checking.gradle
deleted file mode 100644
index 20b042eb7ee..00000000000
--- a/gradle/solr-tlp-migration/disable-links-checking.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-configure(project(":solr:solr-ref-guide")) {
- tasks.matching { it.name == "checkLocalJavadocLinksSite" }.all {
- enabled = false
- logger.warn("Skipping checkLocalJavadocLinksSite (tlp git migration)")
- }
-}
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index 5cfc1ea98e9..59e6ee21c0b 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -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/"
]
]
@@ -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/"
]
]
}