This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant.
commit 726f7084832611c9058a3444cb07b546596bb327 Author: Emmanuel Bourg <ebo...@apache.org> Date: Wed Mar 28 00:38:22 2018 +0200 Adjust the source/target level to 1.7 in anticipation of the 1.6 removal in Java 11 --- debian/changelog | 7 +++++++ debian/patches/0013-auto-adjust-target.patch | 18 ++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cc9af1..776578a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ant (1.9.10-3) UNRELEASED; urgency=medium + + * Adjust the source/target level to 1.7 in anticipation of the 1.6 removal + in Java 11 + + -- Emmanuel Bourg <ebo...@apache.org> Wed, 28 Mar 2018 00:36:12 +0200 + ant (1.9.10-2) unstable; urgency=medium * Non maintainer upload. diff --git a/debian/patches/0013-auto-adjust-target.patch b/debian/patches/0013-auto-adjust-target.patch index 0b76165..98153cf 100644 --- a/debian/patches/0013-auto-adjust-target.patch +++ b/debian/patches/0013-auto-adjust-target.patch @@ -1,16 +1,6 @@ -From: "ebo...@apache.org" <ebo...@apache.org> -Date: Fri, 30 Jun 2017 00:35:44 +0200 -Subject: Adjust the source compatibility automatically for Debian builds with - Java 9 - +Description: Adjust the source compatibility automatically for Debian builds with Java 9 +Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: no ---- - src/main/org/apache/tools/ant/taskdefs/Javac.java | 13 ++++- - .../org/apache/tools/ant/taskdefs/Javadoc.java | 7 ++- - .../apache/tools/ant/taskdefs/LanguageLevel.java | 62 ++++++++++++++++++++++ - 3 files changed, 79 insertions(+), 3 deletions(-) - create mode 100644 src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java - --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -210,7 +210,10 @@ @@ -77,10 +67,10 @@ Forwarded: no +class LanguageLevel { + + /** The minimum language level supported by the current javac */ -+ private static final String MIN_LEVEL = "1.6"; ++ private static final String MIN_LEVEL = "1.7"; + + /** The list of language levels no longer supported by the current javac */ -+ private static final List<String> UNSUPPORTED_LEVELS = Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5"}); ++ private static final List<String> UNSUPPORTED_LEVELS = Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6"}); + + /** Detect if a Debian build is in process */ + static boolean isDebianBuild() { -- 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