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

LUCENE-7292: Fix build to use "--release 8" instead of "-release 8" on Java 9 (this changed with recent EA build b135)

This commit is contained in:
Uwe Schindler 2016-09-20 00:01:45 +02:00
parent 3d130097b7
commit 3712bf5819
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lucene/CHANGES.txt
View File

@ -70,6 +70,11 @@ Optimizations
Other Other
Build
* LUCENE-7292: Fix build to use "--release 8" instead of "-release 8" on
Java 9 (this changed with recent EA build b135). (Uwe Schindler)
======================= Lucene 6.2.1 ======================= ======================= Lucene 6.2.1 =======================
(No Changes) (No Changes)

4
lucene/common-build.xml
View File

@ -1942,7 +1942,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<sequential> <sequential>
<local name="javac.release.args"/> <local name="javac.release.args"/>
<condition property="javac.release.args" value="-source @{javac.release} -target @{javac.release}" else="-release @{javac.release}"> <condition property="javac.release.args" value="-source @{javac.release} -target @{javac.release}" else="--release @{javac.release}">
<equals arg1="${build.java.runtime}" arg2="1.8"/> <equals arg1="${build.java.runtime}" arg2="1.8"/>
</condition> </condition>
<mkdir dir="@{destdir}"/> <mkdir dir="@{destdir}"/>
@ -2072,7 +2072,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<attribute name="linksource" default="no"/> <attribute name="linksource" default="no"/>
<sequential> <sequential>
<local name="javadoc.release.args"/> <local name="javadoc.release.args"/>
<condition property="javadoc.release.args" value="-source ${javac.release}" else="-release ${javac.release}"> <condition property="javadoc.release.args" value="-source ${javac.release}" else="--release ${javac.release}">
<equals arg1="${build.java.runtime}" arg2="1.8"/> <equals arg1="${build.java.runtime}" arg2="1.8"/>
</condition> </condition>
<antcall target="download-java8-javadoc-packagelist"/> <antcall target="download-java8-javadoc-packagelist"/>