[ehcache] 05/06: Build depend on libservlet3.1-java instead of libservlet3.0-java Removed the runtime dependency on the Servlet API

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Apr 29 15:49:13 UTC 2015


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

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

commit 6402fc91a7d87e2253a4f58c4570e7b3c42287b3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 29 17:47:40 2015 +0200

    Build depend on libservlet3.1-java instead of libservlet3.0-java
    Removed the runtime dependency on the Servlet API
---
 debian/changelog | 2 ++
 debian/control   | 3 +--
 debian/rules     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27bd292..8743e49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ehcache (2.6.11-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Build depend on libservlet3.1-java instead of libservlet3.0-java
+  * Removed the runtime dependency on the Servlet API
   * Standards-Version updated to 3.9.6 (no changes)
   * Moved the package to Git
 
diff --git a/debian/control b/debian/control
index e4424d4..42f670a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: ant,
                libhibernate3-java,
                libjgroups-java,
                libjsr107cache-java,
-               libservlet3.0-java,
+               libservlet3.1-java,
                libslf4j-java,
                maven-repo-helper
 Standards-Version: 3.9.6
@@ -29,7 +29,6 @@ Architecture: all
 Depends: libcommons-collections3-java,
          libcommons-logging-java,
          libjsr107cache-java,
-         libservlet3.0-java,
          ${misc:Depends}
 Description: distributed cache library
  Ehcache is a distributed cache for general purpose caching in Java,
diff --git a/debian/rules b/debian/rules
index ad0762d..82b7a3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/class/ant.mk
 JAVA_HOME := /usr/lib/jvm/default-java/
 DEB_ANT_BUILDFILE := debian/build.xml
 DEB_ANT_BUILD_TARGET := jar
-DEB_JARS := commons-logging servlet-api-3.0	\
+DEB_JARS := commons-logging servlet-api-3.1	\
 		slf4j-api geronimo-jta-1.0.1b-spec btm \
 		jsr107cache hibernate3 commons-collections3 jgroups-all
 

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



More information about the pkg-java-commits mailing list