This is an automated email from the git hooks/post-receive script. faux-guest pushed a commit to branch master in repository ant.
commit 2897cc4feed5a7d5bb431096602efecd143c0a78 Author: Chris West (Faux) <g...@goeswhere.com> Date: Tue Dec 12 15:19:34 2017 +0000 ignore-source-errors in javadoc invocations (Closes #884187) --- debian/patches/0013-auto-adjust-target.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/patches/0013-auto-adjust-target.patch b/debian/patches/0013-auto-adjust-target.patch index f0f7e30..6ab2bde 100644 --- a/debian/patches/0013-auto-adjust-target.patch +++ b/debian/patches/0013-auto-adjust-target.patch @@ -1,14 +1,14 @@ From: "ebo...@apache.org" <ebo...@apache.org> Date: Fri, 30 Jun 2017 00:35:44 +0200 -Subject: Adjust the source/target level automatically for Debian builds with +Subject: Adjust the source compatibility automatically for Debian builds with Java 9 Forwarded: no --- src/main/org/apache/tools/ant/taskdefs/Javac.java | 13 ++++- - .../org/apache/tools/ant/taskdefs/Javadoc.java | 2 +- + .../org/apache/tools/ant/taskdefs/Javadoc.java | 7 ++- .../apache/tools/ant/taskdefs/LanguageLevel.java | 62 ++++++++++++++++++++++ - 3 files changed, 74 insertions(+), 3 deletions(-) + 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -50,15 +50,20 @@ index 23c19dd..fbdf409 100644 // compile list if (hasPath(src)) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java -index b9cc3b8..814ec8d 100644 +index b9cc3b8..0404ae7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java -@@ -2203,7 +2203,7 @@ public class Javadoc extends Task { +@@ -2203,7 +2203,12 @@ public class Javadoc extends Task { : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE); if (sourceArg != null) { toExecute.createArgument().setValue("-source"); - toExecute.createArgument().setValue(sourceArg); + toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this)); ++ } ++ ++ if (LanguageLevel.isDebianBuild() && !LanguageLevel.isPreJava9()) { ++ toExecute.createArgument().setValue("--ignore-source-errors"); ++ log("Debian build on Java >=9: Adding --ignore-source-errors."); } if (linksource && doclet == null) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits