[libspring-java] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Dec 23 08:17:51 UTC 2016
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 8cf7ccb6d5cc0e46ad4cf3477508831b0bc1e1df
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Dec 23 09:12:08 2016 +0100
Refreshed the patches
---
debian/changelog | 8 ++++++++
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 | 4 ++--
debian/patches/0044-ignore-httpunit.patch | 2 +-
debian/patches/0045-ignore-caffeine.patch | 2 +-
12 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8049b7a..d2a257e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-java (4.3.5-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 23 Dec 2016 09:10:59 +0100
+
libspring-java (4.3.4-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index da8ca69..0f64484 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
-@@ -552,6 +552,15 @@
+@@ -553,6 +553,15 @@
testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
}
diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch
index bc9bb73..0ff7ec0 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 <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1149,7 +1149,6 @@
+@@ -1151,7 +1151,6 @@
description = "Spring Framework"
apply plugin: "org.asciidoctor.convert"
@@ -12,7 +12,7 @@ Forwarded: not-needed
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
-@@ -1163,13 +1162,6 @@
+@@ -1165,13 +1164,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") }
}
-@@ -1243,7 +1235,7 @@
+@@ -1245,7 +1237,7 @@
}
}
@@ -35,7 +35,7 @@ Forwarded: not-needed
group = "Distribution"
baseName = "spring-framework"
classifier = "docs"
-@@ -1257,10 +1249,6 @@
+@@ -1259,10 +1251,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 b78bef9..3bb660e 100644
--- a/debian/patches/0028-disable-jdiff-report.patch
+++ b/debian/patches/0028-disable-jdiff-report.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1152,7 +1152,7 @@
+@@ -1154,7 +1154,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 2297fdf..3ba8ac2 100644
--- a/debian/patches/0035-ignore-asciidoctor-plugin.patch
+++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1148,24 +1148,11 @@
+@@ -1150,24 +1150,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 52691fc..3816eff 100644
--- a/debian/patches/0036-ignore-compilation-warnings.patch
+++ b/debian/patches/0036-ignore-compilation-warnings.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -97,7 +97,7 @@
+@@ -98,7 +98,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 d092176..9a972ff 100644
--- a/debian/patches/0037-ignore-sonar-plugin.patch
+++ b/debian/patches/0037-ignore-sonar-plugin.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
ext {
linkHomepage = 'https://projects.spring.io/spring-framework'
linkCi = 'https://build.spring.io/browse/SPR'
-@@ -1131,20 +1127,6 @@
+@@ -1133,20 +1129,6 @@
}
}
@@ -35,7 +35,7 @@ Forwarded: not-needed
configure(rootProject) {
description = "Spring Framework"
-@@ -1360,21 +1342,6 @@
+@@ -1362,21 +1344,6 @@
}
diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch
index 3d261c2..21f6ae8 100644
--- a/debian/patches/0039-openjpa-compatibility.patch
+++ b/debian/patches/0039-openjpa-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -758,6 +758,7 @@
+@@ -760,6 +760,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 582ff84..8dae4d0 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
-@@ -490,6 +490,14 @@
+@@ -491,6 +491,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 267f6c1..3bcee2b 100644
--- a/debian/patches/0043-ignore-okhttp.patch
+++ b/debian/patches/0043-ignore-okhttp.patch
@@ -3,8 +3,8 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -735,6 +735,14 @@
- testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${jackson2Version}")
+@@ -737,6 +737,14 @@
+ testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
}
+
diff --git a/debian/patches/0044-ignore-httpunit.patch b/debian/patches/0044-ignore-httpunit.patch
index e0fb4ed..137c7ac 100644
--- a/debian/patches/0044-ignore-httpunit.patch
+++ b/debian/patches/0044-ignore-httpunit.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1054,6 +1054,15 @@
+@@ -1056,6 +1056,15 @@
testRuntime("org.terracotta:management-model:2.3.0")
}
diff --git a/debian/patches/0045-ignore-caffeine.patch b/debian/patches/0045-ignore-caffeine.patch
index 077a8e7..4112ba3 100644
--- a/debian/patches/0045-ignore-caffeine.patch
+++ b/debian/patches/0045-ignore-caffeine.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -669,6 +669,14 @@
+@@ -670,6 +670,14 @@
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
testRuntime("org.ehcache:jcache:${ehcachejcacheVersion}")
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git
More information about the pkg-java-commits
mailing list