This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository tomcat7.
commit 946c3a09b011af610db132780cbf43a0f272c913 Author: Miguel Landaeta <[email protected]> Date: Thu May 1 23:35:33 2014 -0300 Add patch 0020-disable-java8-support-with-jdtcompiler.patch --- debian/changelog | 4 +++- ...20-disable-java8-support-with-jdtcompiler.patch | 28 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c89a792..ce8900a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,11 @@ tomcat7 (7.0.53-1) UNRELEASED; urgency=low * Refresh patches: - debian/patches/0011-fix-classpath-lintian-warnings.patch. - debian/patches/0015_disable_test_TestCometProcessor.patch. + * Add new patch: + - Disabled Java 8 support in JSPs (requires an Eclipse compiler update). * Update my email address in Uploaders list. - -- Miguel Landaeta <[email protected]> Thu, 01 May 2014 21:58:20 -0300 + -- Miguel Landaeta <[email protected]> Thu, 01 May 2014 23:33:35 -0300 tomcat7 (7.0.52-1) unstable; urgency=low 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..798bc66 --- /dev/null +++ b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch @@ -0,0 +1,28 @@ +Description: Drop Java 8 support in JSP files until the Eclipse compiler is updated +Author: Emmanuel Bourg <[email protected]> +Forwarded: no + +--- tomcat7-7.0.53.orig/java/org/apache/jasper/compiler/JDTCompiler.java ++++ tomcat7-7.0.53/java/org/apache/jasper/compiler/JDTCompiler.java +@@ -333,9 +333,6 @@ public class JDTCompiler extends org.apa + } 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, +@@ -377,11 +374,6 @@ public class JDTCompiler extends org.apa + 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 ea1e9e8..35ae345 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/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
