You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gc...@apache.org on 2016/01/13 23:48:59 UTC
svn commit: r1724521 - in /lucene/dev/branches/branch_5x/solr: CHANGES.txt
common-build.xml
Author: gchanan
Date: Wed Jan 13 22:48:59 2016
New Revision: 1724521
URL: http://svn.apache.org/viewvc?rev=1724521&view=rev
Log:
SOLR-8535: Support forcing define-lucene-javadoc-url to be local
Modified:
lucene/dev/branches/branch_5x/solr/CHANGES.txt
lucene/dev/branches/branch_5x/solr/common-build.xml
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1724521&r1=1724520&r2=1724521&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Jan 13 22:48:59 2016
@@ -297,6 +297,8 @@ Other Changes
* SOLR-7042: bin/post now uses /update/json/docs for application/json content types, including support for
.jsonl (JSON Lines) files. (Erik Hatcher and shalin)
+* SOLR-8535: Support forcing define-lucene-javadoc-url to be local (Gregory Chanan)
+
================== 5.4.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/common-build.xml?rev=1724521&r1=1724520&r2=1724521&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/common-build.xml Wed Jan 13 22:48:59 2016
@@ -341,9 +341,11 @@
</macrodef>
<target name="define-lucene-javadoc-url" depends="resolve-groovy" unless="lucene.javadoc.url">
+ <property name="useLocalJavadocUrl" value=""/>
<groovy><![CDATA[
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();
if (!(url =~ /\/$/)) url += '/';
} else {