[libspring-java] 02/04: Refreshed the patches

Mon Sep 26 07:43:29 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 a967af94a76637654db7962c86e26ed20bc3a6cb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 26 09:16:40 2016 +0200

    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/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 +-
 debian/patches/0045-ignore-caffeine.patch                 | 2 +-
 11 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cad829b..439ced6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-java (4.3.3-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 26 Sep 2016 09:15:28 +0200
+
 libspring-java (4.3.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index 3719f73..da8ca69 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
-@@ -550,6 +550,15 @@
+@@ -552,6 +552,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 e9e5d1b..bc9bb73 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
-@@ -1147,7 +1147,6 @@
+@@ -1149,7 +1149,6 @@
  	description = "Spring Framework"
  
  	apply plugin: "org.asciidoctor.convert"
@@ -12,7 +12,7 @@ Forwarded: not-needed
  	apply plugin: "groovy"
  
  	// apply plugin: "detect-split-packages"
-@@ -1161,13 +1160,6 @@
+@@ -1163,13 +1162,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") }
  	}
-@@ -1241,7 +1233,7 @@
+@@ -1243,7 +1235,7 @@
  		}
  	}
  
@@ -35,7 +35,7 @@ Forwarded: not-needed
  		group = "Distribution"
  		baseName = "spring-framework"
  		classifier = "docs"
-@@ -1255,10 +1247,6 @@
+@@ -1257,10 +1249,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 1e17958..b78bef9 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
-@@ -1150,7 +1150,7 @@
+@@ -1152,7 +1152,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 a3956f2..2297fdf 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
-@@ -1146,24 +1146,11 @@
+@@ -1148,24 +1148,11 @@
  configure(rootProject) {
  	description = "Spring Framework"
  
diff --git a/debian/patches/0037-ignore-sonar-plugin.patch b/debian/patches/0037-ignore-sonar-plugin.patch
index bbb7493..d092176 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'
-@@ -1129,20 +1125,6 @@
+@@ -1131,20 +1127,6 @@
  	}
  }
  
@@ -35,7 +35,7 @@ Forwarded: not-needed
  configure(rootProject) {
  	description = "Spring Framework"
  
-@@ -1358,21 +1340,6 @@
+@@ -1360,21 +1342,6 @@
  
  }
  
diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch
index 6844621..3d261c2 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
-@@ -756,6 +756,7 @@
+@@ -758,6 +758,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 e238a16..582ff84 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
-@@ -488,6 +488,14 @@
+@@ -490,6 +490,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 7390ebb..267f6c1 100644
--- a/debian/patches/0043-ignore-okhttp.patch
+++ b/debian/patches/0043-ignore-okhttp.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -733,6 +733,14 @@
+@@ -735,6 +735,14 @@
  		testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${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 f2aa3cf..937b503 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
-@@ -1052,6 +1052,15 @@
+@@ -1054,6 +1054,15 @@
  		testRuntime("org.terracotta:management-model:2.0.0")
  	}
  
diff --git a/debian/patches/0045-ignore-caffeine.patch b/debian/patches/0045-ignore-caffeine.patch
index 8c4e5bf..077a8e7 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
-@@ -667,6 +667,14 @@
+@@ -669,6 +669,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

