[libspring-webflow-2.0-java] 06/06: Switched to the Servlet API 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 libspring-webflow-2.0-java.

commit 4568a275ecd9f8d9ea805e217c37cd9f32b2d7a4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 7 11:14:04 2014 +0200

    Switched to the Servlet API 3.0
---
 debian/build.properties | 6 +++---
 debian/changelog        | 1 +
 debian/classpath-debian | 4 ++--
 debian/control          | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 9a0002c..52aa334 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -10,9 +10,9 @@ dir.src.spring-binding=${dir.src}/spring-binding
 dir.src.spring-js=${dir.src}/spring-js
 dir.src.spring-webflow=${dir.src}/spring-webflow
 
-classpath.spring-binding="spring-core.jar spring-context.jar ognl.jar el-api-2.1.jar spring-beans.jar commons-logging.jar"
-classpath.spring-js="servlet-api-2.5.jar spring-core.jar commons-logging.jar tiles-core.jar tiles-api.jar spring-webmvc.jar spring-web.jar spring-context.jar spring-beans.jar"
-classpath.spring-webflow="spring-beans.jar spring-core.jar commons-logging.jar spring-binding.jar spring-context.jar spring-webmvc.jar spring-aop.jar spring-js.jar el-api-2.1.jar ognl.jar spring-web.jar hibernate3.jar spring-orm.jar spring-tx.jar glassfish-javaee.jar junit.jar backport-util-concurrent.jar portlet-api.jar spring-webmvc-portlet.jar"
+classpath.spring-binding="spring-core.jar spring-context.jar ognl.jar el-api-2.2.jar spring-beans.jar commons-logging.jar"
+classpath.spring-js="servlet-api-3.0.jar spring-core.jar commons-logging.jar tiles-core.jar tiles-api.jar spring-webmvc.jar spring-web.jar spring-context.jar spring-beans.jar"
+classpath.spring-webflow="spring-beans.jar spring-core.jar commons-logging.jar spring-binding.jar spring-context.jar spring-webmvc.jar spring-aop.jar spring-js.jar el-api-2.2.jar ognl.jar spring-web.jar hibernate3.jar spring-orm.jar spring-tx.jar glassfish-javaee.jar junit.jar backport-util-concurrent.jar portlet-api.jar spring-webmvc-portlet.jar"
 
 dist.file.spring-binding=${basedir}/../dist/spring-binding-${version}.jar
 dist.file.spring-js=${basedir}/../dist/spring-js-${version}.jar
diff --git a/debian/changelog b/debian/changelog
index 2b76729..2205c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libspring-webflow-2.0-java (2.0.9.RELEASE-5) unstable; urgency=low
 
   * Team upload
   * Removed the dependency on libbackport-util-concurrent-java
+  * Switched to the Servlet API 3.0
   * debian/control
     - Use canonical URLs for the Vcs-* fields
     - Updated Standards-Version to 3.9.5 (no changes)
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 07268c8..a82c731 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,12 +1,12 @@
 usr/share/java/backport-util-concurrent.jar
 usr/share/java/commons-logging.jar
-usr/share/java/el-api-2.1.jar
+usr/share/java/el-api-2.2.jar
 usr/share/java/glassfish-javaee.jar
 usr/share/java/hibernate3.jar
 usr/share/java/junit.jar
 usr/share/java/ognl.jar
 usr/share/java/portlet-api.jar
-usr/share/java/servlet-api-2.5.jar
+usr/share/java/servlet-api-3.0.jar
 usr/share/java/spring3-core.jar
 usr/share/java/spring3-aop.jar
 usr/share/java/spring3-beans.jar
diff --git a/debian/control b/debian/control
index 6f4a733..216c0ca 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: ant,
                libhibernate3-java,
                libognl-java,
                libportlet-api-2.0-spec-java,
-               libservlet2.5-java,
+               libservlet3.0-java,
                libspring-aop-java,
                libspring-beans-java,
                libspring-context-java,
@@ -34,7 +34,7 @@ Homepage: http://www.springsource.org/webflow
 Package: libspring-js-2.0-java
 Architecture: all
 Depends: libcommons-logging-java,
-         libservlet2.5-java,
+         libservlet3.0-java,
          libspring-beans-java,
          libspring-context-java,
          libspring-core-java,
@@ -61,7 +61,7 @@ Depends: glassfish-javaee,
          libcommons-logging-java,
          libognl-java,
          libportlet-api-2.0-spec-java,
-         libservlet2.5-java,
+         libservlet3.0-java,
          libspring-aop-java,
          libspring-beans-java,
          libspring-context-java,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-webflow-2.0-java.git