[uima-addons] 04/05: Transition to Servlet API 3.0 (Closes: #801007)

[Emmanuel Bourg]

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

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

commit a6aece41e676e182260bf7ee75d0b4889e16005d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 17 10:42:05 2016 +0200

    Transition to Servlet API 3.0 (Closes: #801007)
---
 debian/changelog   | 2 +-
 debian/control     | 4 ++--
 debian/maven.rules | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42bd5db..ed9e7d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 uima-addons (2.3.1-5) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Transition to Jetty 8
+  * Transition to Jetty 8 and Servlet API 3.0 (Closes: #801007)
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index c2f000b..f77f74b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,8 @@ Build-Depends-Indep: ant,
                      libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
                      librhino-java,
-                     libservlet2.5-java,
-                     libservlet2.5-java-doc,
+                     libservlet3.0-java,
+                     libservlet3.0-java-doc,
                      libslf4j-java,
                      libuima-core-java,
                      libuima-tools-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 3ed4231..39fc7cd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,8 +22,7 @@ junit junit jar s/.*/4\.x/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-servlet/ * s/.*/debian/ * *
-javax.servlet servlet-api jar s/.*/2.5/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
+javax.servlet servlet-api jar s/.*/3.0/ * *
 
 org.apache.uima BSFAnnotator jar s/.*/debian/ * *
 org.apache.uima ConceptMapper jar s/.*/debian/ * *

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