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 2016/09/19 22:03:20 UTC
lucene-solr:branch_6x: LUCENE-7292: Fix build to use "--release 8"
instead of "-release 8" on Java 9 (this changed with recent EA build b135)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x f96017d9e -> b67a062f9
LUCENE-7292: Fix build to use "--release 8" instead of "-release 8" on Java 9 (this changed with recent EA build b135)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b67a062f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b67a062f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b67a062f
Branch: refs/heads/branch_6x
Commit: b67a062f9db6372cf654a4366233e953c89f2722
Parents: f96017d
Author: Uwe Schindler <us...@apache.org>
Authored: Tue Sep 20 00:01:45 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Tue Sep 20 00:03:04 2016 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 5 +++++
lucene/common-build.xml | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b67a062f/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 522da2f..4250350 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -39,6 +39,11 @@ Optimizations
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 =======================
(No Changes)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b67a062f/lucene/common-build.xml
----------------------------------------------------------------------
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 1820e00..0fa6b3f 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1942,7 +1942,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<sequential>
<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"/>
</condition>
<mkdir dir="@{destdir}"/>
@@ -2072,7 +2072,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<attribute name="linksource" default="no"/>
<sequential>
<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"/>
</condition>
<antcall target="download-java8-javadoc-packagelist"/>