[gradle] 01/01: Migrate to libservlet3.1-java and libtomcat8-java (Closes: #801014)

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 495a9ffcff385f0ae070d652566d8cbbf7f6015a
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Oct 6 01:15:01 2015 +0800

    Migrate to libservlet3.1-java and libtomcat8-java (Closes: #801014)
---
 debian/changelog                        | 4 ++++
 debian/control                          | 8 ++++----
 debian/patches/jetty.diff               | 4 ++--
 debian/patches/use_local_artifacts.diff | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9007c9..778e256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ gradle (2.7-1) UNRELEASED; urgency=low
     - Add checkstyle to Recommends
     - Add dh-exec to Build-Depends
     - Add java6-runtime to Depends as an option
+    - Replace dependencies of libservlet2.5-java and libtomcat7-java to
+      libservlet3.1-java and libtomcat8-java
   * d/rules: No need to copy gradle-core codes to buildSrc
   * Remove fix_DocGenerationException.diff: No longer needed
   * Update maven_jcommander.diff to jcommander.diff
@@ -21,6 +23,8 @@ gradle (2.7-1) UNRELEASED; urgency=low
     making a pseudo Gradle installation
   * New d/generate-classpath.gradle and generate_classpath.diff: Auto generate
     classpath attributes to jar manifest
+  * Refresh use_local_artifacts.diff and jetty.diff to migrate to Tomcat 8
+    (Closes: #801014)
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Sat, 03 Oct 2015 18:37:27 +0800
 
diff --git a/debian/control b/debian/control
index a052dbb..69556d8 100644
--- a/debian/control
+++ b/debian/control
@@ -62,10 +62,10 @@ Build-Depends: ant,
                libplexus-utils-java,
                libpolyglot-maven-java,
                librhino-java,
-               libservlet2.5-java,
+               libservlet3.1-java,
                libslf4j-java,
                libspock-java,
-               libtomcat7-java,
+               libtomcat8-java,
                libxalan2-java,
                libxbean-java,
                libxerces2-java,
@@ -167,8 +167,8 @@ Depends: bnd,
          libplexus-utils-java,
          libpolyglot-maven-java,
          librhino-java,
-         libservlet2.5-java,
-         libtomcat7-java,
+         libservlet3.1-java,
+         libtomcat8-java,
          libxerces2-java,
          testng,
          ${misc:Depends}
diff --git a/debian/patches/jetty.diff b/debian/patches/jetty.diff
index 01a377e..5ad2684 100644
--- a/debian/patches/jetty.diff
+++ b/debian/patches/jetty.diff
@@ -10,8 +10,8 @@ Last-Update: 2015-06-14
 
 -    runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
 -        dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
-+    runtime module("org.apache.tomcat:tomcat-jasper") {
-+        dependency "javax.servlet.jsp:jsp-api-2.1"
++    runtime module("org.apache.tomcat:tomcat8-jasper") {
++        dependency "javax.servlet.jsp:jsp-api-2.3"
          dependency libraries.jetty_util
          dependency libraries.servlet_api
      }
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index a3fb99f..55cd977 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -89,7 +89,7 @@ Last-Update: 2015-07-08
  
  // Jetty
 -libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
-+libraries.servlet_api = "org.mortbay.jetty:servlet-api-2.5 at jar"
++libraries.servlet_api = "javax.servlet:servlet-api-3.1 at jar"
  libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
      dependency libraries.slf4j_api
      dependency libraries.servlet_api

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