Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8535: Support forcing define-lucene-javadoc-url to be local 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1724520 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gregory Chanan 2016-01-13 22:48:39 +00:00
parent f6ede1b42f
commit b904599036
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -508,6 +508,8 @@ Other Changes
* SOLR-8476: Refactor and cleanup CoreAdminHandler (noble, Varun Thacker) * SOLR-8476: Refactor and cleanup CoreAdminHandler (noble, Varun Thacker)
* SOLR-8535: Support forcing define-lucene-javadoc-url to be local (Gregory Chanan)
================== 5.4.1 ================== ================== 5.4.1 ==================
Bug Fixes Bug Fixes

4
solr/common-build.xml
View File

@ -331,9 +331,11 @@
</macrodef> </macrodef>
<target name="define-lucene-javadoc-url" depends="resolve-groovy" unless="lucene.javadoc.url"> <target name="define-lucene-javadoc-url" depends="resolve-groovy" unless="lucene.javadoc.url">
<property name="useLocalJavadocUrl" value=""/>
<groovy><![CDATA[ <groovy><![CDATA[
String url, version = properties['version']; String url, version = properties['version'];
if (version.contains('-SNAPSHOT')) { String useLocalJavadocUrl = properties['useLocalJavadocUrl'];
if (version.contains('-SNAPSHOT') || Boolean.parseBoolean(useLocalJavadocUrl)) {
url = new File(properties['common.dir'], 'build' + File.separator + 'docs').toURI().toASCIIString(); url = new File(properties['common.dir'], 'build' + File.separator + 'docs').toURI().toASCIIString();
if (!(url =~ /\/$/)) url += '/'; if (!(url =~ /\/$/)) url += '/';
} else { } else {