[libcommons-logging-java] 37/66: Upgraded the dependency on the Servlet API (2.5 -> 3.0)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libcommons-logging-java.

commit f8fc2331fff344743613dbafca1f0dc89f79aa86
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 4 12:52:48 2013 +0000

    Upgraded the dependency on the Servlet API (2.5 -> 3.0)
---
 debian/ant.properties                      | 2 +-
 debian/changelog                           | 3 ++-
 debian/control                             | 4 ++--
 debian/maven.rules                         | 5 +++--
 debian/patches/06_classpath_manifest.patch | 2 +-
 debian/rules                               | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 95684ed..b750d5b 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -3,5 +3,5 @@ log4j12.jar=/usr/share/java/log4j-1.2.jar
 logkit.jar=/usr/share/java/excalibur-logkit.jar
 avalon-framework.jar=/usr/share/java/avalon-framework.jar
 junit.jar=/usr/share/java/junit.jar
-servletapi.jar=/usr/share/java/servlet-api-2.5.jar
+servletapi.jar=/usr/share/java/servlet-api-3.0.jar
 test.failonerror=false
diff --git a/debian/changelog b/debian/changelog
index 260052a..e07edbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ libcommons-logging-java (1.1.2-1) experimental; urgency=low
   * Updated Standards-Version to 3.9.4: no changes needed.
   * Refreshed the patches
   * Fixed the outdated OSGi metadata
+  * Upgraded the dependency on the Servlet API (2.5 -> 3.0)
   * debian/copyright: converted to DEP5 format, updated the contributors
 
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Apr 2013 13:27:23 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Apr 2013 14:48:38 +0200
 
 libcommons-logging-java (1.1.1-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 19447a7..ba2d074 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: junit,
                      libcommons-parent-java,
                      libexcalibur-logkit-java,
                      liblog4j1.2-java,
-                     libservlet2.5-java,
+                     libservlet3.0-java,
                      maven-repo-helper
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java
@@ -24,7 +24,7 @@ Suggests: libavalon-framework-java,
           libcommons-logging-java-doc,
           libexcalibur-logkit-java,
           liblog4j1.2-java,
-          libservlet2.5-java
+          libservlet3.0-java
 Description: commmon wrapper interface for several logging APIs
  Provides a simple, component oriented interface together with wrappers for
  several existing java logging systems. The user can choose at runtime which
diff --git a/debian/maven.rules b/debian/maven.rules
index 0a8897f..fbb22ce 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,6 @@
 junit junit jar s/3\..*/3.x/
 log4j log4j jar s/1\.2\..*/1.2.x/
-# force using servlet 2.5
-javax.servlet * * s/.*/2.5/
+# force using servlet 3.0
+javax.servlet * * s/.*/3.0/
 s/avalon-framework/org.apache.avalon/ avalon-framework jar s/.*/debian/
+
diff --git a/debian/patches/06_classpath_manifest.patch b/debian/patches/06_classpath_manifest.patch
index 282d61d..263b0d7 100644
--- a/debian/patches/06_classpath_manifest.patch
+++ b/debian/patches/06_classpath_manifest.patch
@@ -6,4 +6,4 @@ Forwarded: not-needed
   .0)",org.apache.avalon.framework.logger;resolution:=optional;version=
   "[4.1.3,4.1.5]",org.apache.log;resolution:=optional;version="[1.0.1,1
   .0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)"
-+Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar servlet-api-2.5.jar
++Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar servlet-api-3.0.jar
diff --git a/debian/rules b/debian/rules
index c7a9935..e83b191 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME		     := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := dist
-DEB_JARS		     := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-2.5 junit ant-junit
+DEB_JARS		     := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.0 junit ant-junit
 
 makebuilddir/lib$(PACKAGE)-java::
 	# copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar

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