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 040ee557a10f5b83a2a99dda4426610dd3f8f9c1 Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 2 11:59:38 2016 +0200 Refreshed the patches --- debian/changelog | 2 +- debian/patches/0003_no_ibm_websphere.diff | 2 +- debian/patches/0022-ignore-docbook-reference-plugin.patch | 8 ++++---- debian/patches/0028-disable-jdiff-report.patch | 2 +- debian/patches/0035-ignore-asciidoctor-plugin.patch | 2 +- debian/patches/0036-ignore-compilation-warnings.patch | 2 +- debian/patches/0037-ignore-sonar-plugin.patch | 4 ++-- debian/patches/0039-openjpa-compatibility.patch | 2 +- debian/patches/0042-ignore-money-api.patch | 2 +- debian/patches/0043-ignore-okhttp.patch | 2 +- debian/patches/0044-ignore-httpunit.patch | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a66594..7955687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libspring-java (4.2.6-1) UNRELEASED; urgency=medium +libspring-java (4.2.7-1) UNRELEASED; urgency=medium * Team upload. * New upstream release diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff index 949d874..625fb1a 100644 --- a/debian/patches/0003_no_ibm_websphere.diff +++ b/debian/patches/0003_no_ibm_websphere.diff @@ -4,7 +4,7 @@ Last-Update: 2010-06-20 Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -545,6 +545,15 @@ +@@ -546,6 +546,15 @@ testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.eclipse.persistence:javax.persistence:2.0.0") } diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch index 69ac08a..932cf71 100644 --- a/debian/patches/0022-ignore-docbook-reference-plugin.patch +++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch @@ -4,7 +4,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1154,7 +1154,6 @@ +@@ -1156,7 +1156,6 @@ description = "Spring Framework" apply plugin: "org.asciidoctor.convert" @@ -12,7 +12,7 @@ Forwarded: not-needed apply plugin: "groovy" // apply plugin: "detect-split-packages" -@@ -1168,13 +1167,6 @@ +@@ -1170,13 +1169,6 @@ attributes 'spring-version': project.version, 'revnumber': project.version, 'docinfo': "" } @@ -26,7 +26,7 @@ Forwarded: not-needed afterEvaluate { tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") } } -@@ -1248,7 +1240,7 @@ +@@ -1250,7 +1242,7 @@ } } @@ -35,7 +35,7 @@ Forwarded: not-needed group = "Distribution" baseName = "spring-framework" classifier = "docs" -@@ -1262,10 +1254,6 @@ +@@ -1264,10 +1256,6 @@ from (api) { into "javadoc-api" } diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch index 8fab655..ef33fc1 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 -@@ -1157,7 +1157,7 @@ +@@ -1159,7 +1159,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 d6d8a74..a0b2475 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 -@@ -1153,24 +1153,11 @@ +@@ -1155,24 +1155,11 @@ configure(rootProject) { description = "Spring Framework" diff --git a/debian/patches/0036-ignore-compilation-warnings.patch b/debian/patches/0036-ignore-compilation-warnings.patch index 6c2e4bb..d1cfcf1 100644 --- a/debian/patches/0036-ignore-compilation-warnings.patch +++ b/debian/patches/0036-ignore-compilation-warnings.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/build.gradle +++ b/build.gradle -@@ -90,7 +90,7 @@ +@@ -91,7 +91,7 @@ "-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation", diff --git a/debian/patches/0037-ignore-sonar-plugin.patch b/debian/patches/0037-ignore-sonar-plugin.patch index d63b36e..8de0e4e 100644 --- a/debian/patches/0037-ignore-sonar-plugin.patch +++ b/debian/patches/0037-ignore-sonar-plugin.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1134,22 +1134,6 @@ +@@ -1136,22 +1136,6 @@ } } @@ -26,7 +26,7 @@ Forwarded: not-needed configure(rootProject) { description = "Spring Framework" -@@ -1365,21 +1349,6 @@ +@@ -1367,21 +1351,6 @@ } diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch index a633252..0b291d4 100644 --- a/debian/patches/0039-openjpa-compatibility.patch +++ b/debian/patches/0039-openjpa-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -765,6 +765,7 @@ +@@ -766,6 +766,7 @@ exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec' exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec' } diff --git a/debian/patches/0042-ignore-money-api.patch b/debian/patches/0042-ignore-money-api.patch index 79dafce..fd52618 100644 --- a/debian/patches/0042-ignore-money-api.patch +++ b/debian/patches/0042-ignore-money-api.patch @@ -29,7 +29,7 @@ Forwarded: not-needed // just handling JSR-310 specific date and time types --- a/build.gradle +++ b/build.gradle -@@ -486,6 +486,14 @@ +@@ -487,6 +487,14 @@ testCompile("org.apache.commons:commons-pool2:2.4.2") testCompile("org.slf4j:slf4j-api:${slf4jVersion}") } diff --git a/debian/patches/0043-ignore-okhttp.patch b/debian/patches/0043-ignore-okhttp.patch index 27032f4..fa4208b 100644 --- a/debian/patches/0043-ignore-okhttp.patch +++ b/debian/patches/0043-ignore-okhttp.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -741,6 +741,14 @@ +@@ -742,6 +742,14 @@ testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}") testRuntime("com.sun.mail:javax.mail:${javamailVersion}") } diff --git a/debian/patches/0044-ignore-httpunit.patch b/debian/patches/0044-ignore-httpunit.patch index a100515..da0a8b5 100644 --- a/debian/patches/0044-ignore-httpunit.patch +++ b/debian/patches/0044-ignore-httpunit.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1061,6 +1061,15 @@ +@@ -1063,6 +1063,15 @@ testRuntime("org.terracotta:management-model:2.0.0") } -- 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
