You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/04/17 14:32:17 UTC
svn commit: r1588231 - in /lucene/dev/branches/lucene_solr_4_8: ./ lucene/
lucene/CHANGES.txt lucene/common-build.xml
Author: uschindler
Date: Thu Apr 17 12:32:16 2014
New Revision: 1588231
URL: http://svn.apache.org/r1588231
Log:
Merged revision(s) 1588229 from lucene/dev/branches/branch_4x:
Merged revision(s) 1588228 from lucene/dev/trunk:
LUCENE-5614: Enable building on Java 8 using Apache Ant 1.8.3 or 1.8.4 by adding a workaround for the Ant bug
Modified:
lucene/dev/branches/lucene_solr_4_8/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/lucene_solr_4_8/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/lucene/CHANGES.txt?rev=1588231&r1=1588230&r2=1588231&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_8/lucene/CHANGES.txt Thu Apr 17 12:32:16 2014
@@ -225,7 +225,10 @@ Build
* LUCENE-5512: Remove redundant typing (use diamond operator) throughout
the codebase. (Furkan KAMACI via Robert Muir)
-Documentation:
+* LUCENE-5614: Enable building on Java 8 using Apache Ant 1.8.3 or 1.8.4
+ by adding a workaround for the Ant bug. (Uwe Schindler)
+
+Documentation
* LUCENE-5534: Add javadocs to GreekStemmer methods.
(Stamatis Pitsios via Robert Muir)
Modified: lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml?rev=1588231&r1=1588230&r2=1588231&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_8/lucene/common-build.xml Thu Apr 17 12:32:16 2014
@@ -332,6 +332,17 @@
</and>
</condition>
+ <!-- workaround for https://issues.apache.org/bugzilla/show_bug.cgi?id=53347 -->
+ <condition property="build.compiler" value="javac1.7">
+ <and>
+ <equals arg1="${build.java.runtime}" arg2="1.8"/>
+ <or>
+ <antversion exactly="1.8.3" />
+ <antversion exactly="1.8.4" />
+ </or>
+ </and>
+ </condition>
+
<target name="-documentation-lint-unsupported" unless="documentation-lint.supported">
<fail message="Linting documentation HTML is not supported on this Java version (${build.java.runtime}) / JVM (${java.vm.name}).">
<condition>