[netty-3.9] 01/03: Transition to the Servlet API 3.1 (Closes: #801024)

[Emmanuel Bourg]

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

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

commit b5a3c6783f3589800d2a4e36156b0aa65c3de0c0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 20 19:47:02 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801024)
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/maven.rules | 6 +-----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb32668..a75b09c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 netty-3.9 (3.9.0.Final-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Transition to the Servlet API 3.1 (Closes: #801024)
   * Fixed the build failure caused by the fix for #766392
     in maven-debian-helper 2.0.3
   * Added the missing Vcs-* fields
diff --git a/debian/control b/debian/control
index bed4b1a..c1b8457 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep: default-jdk,
  libcommons-logging-java,
  libeasymock-java,
  liblog4j1.2-java,
- libservlet2.5-java,
+ libservlet3.1-java,
  libslf4j-java,
  maven-debian-helper,
  libmaven-bundle-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 32932c0..c301d0c 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,8 +1,4 @@
 
-commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 io.netty netty * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
-s/ant/org.apache.ant/ * * s/.*/debian/ * *
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *

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