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 1dc20662dc3341af43dc71fd088272a1a3d49ce3 Author: Emmanuel Bourg <[email protected]> Date: Mon Apr 4 19:43:05 2016 +0200 Enabled the jcache support --- debian/changelog | 7 +++++++ debian/control | 1 + debian/maven.ignoreRules | 1 - debian/maven.rules | 1 + debian/patches/0027-disable-jcache-support.patch | 21 --------------------- debian/patches/0028-disable-jdiff-report.patch | 2 +- debian/patches/0035-ignore-asciidoctor-plugin.patch | 2 +- debian/patches/series | 1 - 8 files changed, 11 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6a848b..ec625b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libspring-java (4.0.9-2) UNRELEASED; urgency=medium + + * Team upload. + * Enabled the jcache support + + -- Emmanuel Bourg <[email protected]> Mon, 04 Apr 2016 19:36:46 +0200 + libspring-java (4.0.9-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index f37e617..1555624 100644 --- a/debian/control +++ b/debian/control @@ -37,6 +37,7 @@ Build-Depends-Indep: bsh, libgeronimo-ejb-3.0-spec-java, libgeronimo-interceptor-3.0-spec-java, libgeronimo-j2ee-connector-1.5-spec-java (>= 2.0.0-1.1), + libgeronimo-jcache-1.0-spec-java, libgeronimo-jms-1.1-spec-java, libgeronimo-jta-1.2-spec-java, libgeronimo-validation-1.0-spec-java, diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index c86b10c..2aa1cdf 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,7 +1,6 @@ javax.activation activation * * * * com.ibm.websphere uow * * * * com.h2database h2 * * * * -javax.cache cache-api * * * * org.hibernate hibernate-annotations * * * * org.springframework.build.gradle docbook-reference-plugin * * * * org.asciidoctor asciidoctor-gradle-plugin * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 65fc82e..d55db29 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -5,6 +5,7 @@ com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * * s/com.mchange/c3p0/ c3p0 * s/.*/debian/ * * s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * * javax.el javax.el-api * s/.*/3.0/ * * +s/javax.cache/org.apache.geronimo.specs/ s/cache-api/geronimo-jcache_1.0_spec/ * s/.*/debian/ * * s/javax.enterprise.concurrent/org.apache.geronimo.specs/ s/javax.enterprise.concurrent-api/geronimo-concurrent_1.0_spec/ * s/.*/debian/ * * s/javax.faces/com.sun.faces/ s/javax.faces-api/jsf-api/ * s/.*/debian/ * * s/javax.jms/org.apache.geronimo.specs/ s/jms-api/geronimo-jms_1.1_spec/ * s/.*/debian/ * * diff --git a/debian/patches/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch deleted file mode 100644 index 04f6300..0000000 --- a/debian/patches/0027-disable-jcache-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Disable the javax.cache support since the API is not in Debian -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/build.gradle -+++ b/build.gradle -@@ -568,6 +568,15 @@ - - // pick up **/*.types files in src/main - sourceSets.main.resources.srcDirs += "src/main/java" -+ -+ sourceSets { -+ main { -+ java { -+ srcDir 'src/main/java' -+ exclude '**/jcache/**' -+ } -+ } -+ } - } - - project("spring-web") { diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch index bf669b7..caa5c9e 100644 --- a/debian/patches/0028-disable-jdiff-report.patch +++ b/debian/patches/0028-disable-jdiff-report.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -993,7 +993,7 @@ +@@ -984,7 +984,7 @@ apply plugin: "groovy" // apply plugin: "detect-split-packages" diff --git a/debian/patches/0035-ignore-asciidoctor-plugin.patch b/debian/patches/0035-ignore-asciidoctor-plugin.patch index 0691322..2910aee 100644 --- a/debian/patches/0035-ignore-asciidoctor-plugin.patch +++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -993,26 +993,11 @@ +@@ -984,26 +984,11 @@ configure(rootProject) { description = "Spring Framework" diff --git a/debian/patches/series b/debian/patches/series index be95e70..3388288 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 0003_no_ibm_websphere.diff 0005_commonj.diff 0022-ignore-docbook-reference-plugin.patch -0027-disable-jcache-support.patch 0028-disable-jdiff-report.patch 0030-tomcat7-compatibility.patch 0031-gradle2-compatibility.patch -- 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
