[lucene4.10] 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 lucene4.10.

commit 219ab1f933e5309aac970b81ac8837a44faed644
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 5 11:05:54 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 27d505a..1edd506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene4.10 (4.10.4+dfsg-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 05 Aug 2016 11:05:27 +0200
+
 lucene4.10 (4.10.4+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 104d526..d089112 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends-Indep:
  libmorfologik-stemming-java (>= 1.8.3),
  libnekohtml-java,
  libregexp-java,
- libservlet3.0-java,
+ libservlet3.1-java,
  libspatial4j-0.4-java,
  libuima-core-java, libuima-addons-java,
  libxerces2-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 89a40a4..f713fb3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,8 +1,7 @@
 junit junit * s/.*/4.x/ * *
 com.ibm.icu icu4j * s/.*/49/ * *
 org.antlr antlr-runtime * s/.*/3.x/ * *
-s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet/servlet-api/ * s/.*/3.0/ * *
+s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet/javax.servlet-api/ * s/.*/3.1/ * *
 com.spatial4j spatial4j * s/.*/0.4.x/ * *
-javax.servlet servlet-api * s/.*/3.0/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 org.apache.lucene * * s/.*/4.10.x/ * *
-

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