This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 1a869d60ce33b0c2ae6ae0be4ebbc8b7858458e9 Author: Emmanuel Bourg <[email protected]> Date: Tue Apr 29 10:01:10 2014 +0200 Disabled Java 8 support in JSPs --- debian/changelog | 1 + ...20-disable-java8-support-with-jdtcompiler.patch | 27 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index 260cdf6..2aea853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ tomcat8 (8.0.4-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches + - Disabled Java 8 support in JSPs (requires an Eclipse compiler update) -- Emmanuel Bourg <[email protected]> Wed, 19 Mar 2014 22:39:42 +0100 diff --git a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch new file mode 100644 index 0000000..f659183 --- /dev/null +++ b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch @@ -0,0 +1,27 @@ +Description: Drop Java 8 support in JSP files until the Eclipse compiler is updated +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/java/org/apache/jasper/compiler/JDTCompiler.java ++++ b/java/org/apache/jasper/compiler/JDTCompiler.java +@@ -332,9 +332,6 @@ + } else if(opt.equals("1.7")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -376,11 +373,6 @@ + CompilerOptions.VERSION_1_7); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_8); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, diff --git a/debian/patches/series b/debian/patches/series index 164a434..22b56f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 0017-use-jdbc-pool-default.patch 0018-fix-manager-webapp.patch 0019-add-distribution-to-error-page.patch +0020-disable-java8-support-with-jdtcompiler.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
