[tomcat7] 02/02: Enabled Java 8 support in JSPs

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 5f577fc87e03a5b3d217eabf4de3ca657c1d006e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Feb 10 22:39:58 2015 +0100

    Enabled Java 8 support in JSPs
---
 debian/changelog                                   |  8 +++++++
 debian/control                                     |  4 ++--
 debian/patches/0014-JDTCompiler.patch              | 13 ----------
 ...20-disable-java8-support-with-jdtcompiler.patch | 28 ----------------------
 debian/patches/series                              |  2 --
 5 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f72ea7e..7cf4284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat7 (7.0.59-1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Enabled Java 8 support in JSPs (requires libecj-java 3.10.1)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Feb 2015 22:35:09 +0100
+
 tomcat7 (7.0.57-1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 2dc76fa..35985de 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: default-jdk,
  po-debconf,
  libhamcrest-java (>= 1.3)
 Build-Depends-Indep: maven-repo-helper,
- libecj-java,
+ libecj-java (>= 3.10.1~),
  javahelper,
  junit4,
  libjstl1.1-java,
@@ -76,7 +76,7 @@ Description: Servlet and JSP engine -- tools to create user instances
 
 Package: libtomcat7-java
 Architecture: all
-Depends: libecj-java,
+Depends: libecj-java (>= 3.10.1~),
          libcommons-pool-java,
          libcommons-dbcp-java,
          libservlet3.0-java (>= ${source:Version}), ${misc:Depends}
diff --git a/debian/patches/0014-JDTCompiler.patch b/debian/patches/0014-JDTCompiler.patch
deleted file mode 100644
index 750088d..0000000
--- a/debian/patches/0014-JDTCompiler.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
-index 2ee9e95..75f3c67 100644
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -166,7 +166,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-                 return result;
-             }
- 
--            @Override
-+            //@Override
-             public boolean ignoreOptionalProblems() {
-                 return false;
-             }
diff --git a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
deleted file mode 100644
index a8fe9b9..0000000
--- a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Drop Java 8 support in JSP files until the Eclipse compiler is updated
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
-
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -342,9 +342,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,
-@@ -386,11 +383,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 5ac9335..7994a5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,10 +8,8 @@
 0011-fix-classpath-lintian-warnings.patch
 0012-java7-compat.patch
 0013-dont-look-for-build-properties-in-user-home.patch
-0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch
 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
 0021-add-simple-instance-manager.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git