This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit f850cf44c312dedc1ca9d160088a7a0b1b9cfefe Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 22 00:16:18 2015 +0200 Fixed the build failure with Quartz 1.8.6 --- debian/changelog | 1 + debian/patches/0021-use-system-dependencies.patch | 5 +++-- debian/patches/0027-disable-jcache-support.patch | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c0c581..076d651 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libspring-java (3.2.13-4) UNRELEASED; urgency=medium * Team upload. + * Fixed the build failure with Quartz 1.8.6 * Removed the compatibility patches for Gradle < 1.7 * Removed the dependency on the Servlet API from the binary packages diff --git a/debian/patches/0021-use-system-dependencies.patch b/debian/patches/0021-use-system-dependencies.patch index 9061080..f3a9caa 100644 --- a/debian/patches/0021-use-system-dependencies.patch +++ b/debian/patches/0021-use-system-dependencies.patch @@ -219,11 +219,12 @@ Forwarded: not-needed + optional("com.sun.mail:javax.mail:debian") optional("javax.cache:cache-api:0.5") - optional("net.sf.ehcache:ehcache-core:2.0.1") -+ optional("net.sf.ehcache:ehcache-core:debian") - optional("org.quartz-scheduler:quartz:1.7.3") +- optional("org.quartz-scheduler:quartz:1.7.3") - optional("org.codehaus.fabric3.api:commonj:1.1.0") - optional("velocity:velocity:1.5") - optional("org.freemarker:freemarker:2.3.20") ++ optional("net.sf.ehcache:ehcache-core:debian") ++ optional("org.quartz-scheduler:quartz:debian") + optional("org.apache.geronimo.specs:geronimo-commonj_1.1_spec:debian") + optional("org.apache.velocity:velocity:debian") + optional("org.freemarker:freemarker:debian") diff --git a/debian/patches/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch index 022ec2a..0658f00 100644 --- a/debian/patches/0027-disable-jcache-support.patch +++ b/debian/patches/0027-disable-jcache-support.patch @@ -10,7 +10,7 @@ Forwarded: not-needed - optional("javax.cache:cache-api:0.5") + //optional("javax.cache:cache-api:0.5") optional("net.sf.ehcache:ehcache-core:debian") - optional("org.quartz-scheduler:quartz:1.7.3") + optional("org.quartz-scheduler:quartz:debian") optional("org.apache.geronimo.specs:geronimo-commonj_1.1_spec:debian") @@ -489,6 +489,15 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
