[uima-addons] 01/05: Transition to the Servlet API 3.1

[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 c552a5ad156973b4c04afefc32ff746c77c145c5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 21 18:52:19 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog   | 7 +++++++
 debian/control     | 4 ++--
 debian/maven.rules | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab64809..ae4bd44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+uima-addons (2.3.1-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 21 Oct 2016 18:52:05 +0200
+
 uima-addons (2.3.1-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f77f74b..6791854 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,
-                     libservlet3.0-java,
-                     libservlet3.0-java-doc,
+                     libservlet3.1-java,
+                     libservlet3.1-java-doc,
                      libslf4j-java,
                      libuima-core-java,
                      libuima-tools-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 39fc7cd..308af03 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,7 +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/.*/3.0/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
 
 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