[scannotation] 01/05: Completed the transition to the Servlet API 3.1 (Closes: #831062)

[Emmanuel Bourg]

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

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

commit 9296eb6f6f80ae5833d9987af2578bd46c9300d0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 14 13:40:42 2016 +0200

    Completed the transition to the Servlet API 3.1 (Closes: #831062)
---
 debian/changelog                      | 7 +++++++
 debian/libscannotation-java.classpath | 2 +-
 debian/maven.rules                    | 4 +---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15adcca..fd9cc57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scannotation (1.0.2+svn20110812-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Completed the transition to the Servlet API 3.1 (Closes: #831062)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 14 Jul 2016 13:40:13 +0200
+
 scannotation (1.0.2+svn20110812-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/libscannotation-java.classpath b/debian/libscannotation-java.classpath
index 4ddeb91..ff38b09 100644
--- a/debian/libscannotation-java.classpath
+++ b/debian/libscannotation-java.classpath
@@ -1 +1 @@
-usr/share/java/scannotation.jar		/usr/share/java/javassist.jar /usr/share/java/servlet-api-2.5.jar
+usr/share/java/scannotation.jar		/usr/share/java/javassist.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 832f20b..bd2587e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,3 @@
 
 s/jboss/javassist/ javassist * s/.*/debian/ * *
-s/org.apache.tomcat/javax.el/ s/el-api/javax.el-api/ jar s/.*/3.0/ * *
-s/org.apache.tomcat/javax.servlet/ s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/ * *
-s/org.apache.tomcat/javax.servlet/ s/servlet-api/javax.servlet.servlet-api/ jar s/.*/3.1/ * *
+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/scannotation.git