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

Tue Jul 4 09:46:57 UTC 2017

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 a2ba1f2e5b80c3d7aeec1d6f1727ba1cc0174bf6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 11 17:01:43 2017 +0200

    Refreshed the patches
---
 debian/changelog                                          | 4 +++-
 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/0038-rome-compatibility.patch              | 4 ++--
 debian/patches/0039-openjpa-compatibility.patch           | 2 +-
 debian/patches/0041-servlet-api-compatibility.patch       | 4 ++--
 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 +-
 13 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 280618f..6a0a918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-libspring-java (4.3.5-2) UNRELEASED; urgency=medium
+libspring-java (4.3.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Removed the unused dependency on glassfish-toplink-essentials
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Feb 2017 00:25:50 +0100
diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index 0f64484..289e55e 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
-@@ -553,6 +553,15 @@
+@@ -555,6 +555,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 0ff7ec0..69ac08a 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
-@@ -1151,7 +1151,6 @@
+@@ -1154,7 +1154,6 @@
  	description = "Spring Framework"
  
  	apply plugin: "org.asciidoctor.convert"
@@ -12,7 +12,7 @@ Forwarded: not-needed
  	apply plugin: "groovy"
  
  	// apply plugin: "detect-split-packages"
-@@ -1165,13 +1164,6 @@
+@@ -1168,13 +1167,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") }
  	}
-@@ -1245,7 +1237,7 @@
+@@ -1248,7 +1240,7 @@
  		}
  	}
  
@@ -35,7 +35,7 @@ Forwarded: not-needed
  		group = "Distribution"
  		baseName = "spring-framework"
  		classifier = "docs"
-@@ -1259,10 +1251,6 @@
+@@ -1262,10 +1254,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 3bb660e..8fab655 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
-@@ -1154,7 +1154,7 @@
+@@ -1157,7 +1157,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 3ba8ac2..d6d8a74 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
-@@ -1150,24 +1150,11 @@
+@@ -1153,24 +1153,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 9a972ff..07f8d46 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'
-@@ -1133,20 +1129,6 @@
+@@ -1136,20 +1132,6 @@
  	}
  }
  
@@ -35,7 +35,7 @@ Forwarded: not-needed
  configure(rootProject) {
  	description = "Spring Framework"
  
-@@ -1362,21 +1344,6 @@
+@@ -1365,21 +1347,6 @@
  
  }
  
diff --git a/debian/patches/0038-rome-compatibility.patch b/debian/patches/0038-rome-compatibility.patch
index 8023180..d9c886d 100644
--- a/debian/patches/0038-rome-compatibility.patch
+++ b/debian/patches/0038-rome-compatibility.patch
@@ -77,5 +77,5 @@ Forwarded: not-needed
 +import com.sun.syndication.feed.rss.Channel;
 +import com.sun.syndication.feed.rss.Item;
  
- /**
-  * Abstract superclass for RSS Feed views, using the
+ import org.springframework.http.MediaType;
+ 
diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch
index 21f6ae8..cc7d031 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
-@@ -760,6 +760,7 @@
+@@ -763,6 +763,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/0041-servlet-api-compatibility.patch b/debian/patches/0041-servlet-api-compatibility.patch
index 168a45b..7514fef 100644
--- a/debian/patches/0041-servlet-api-compatibility.patch
+++ b/debian/patches/0041-servlet-api-compatibility.patch
@@ -20,7 +20,7 @@ Forwarded: no
  
 --- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
 +++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
-@@ -182,6 +182,21 @@
+@@ -221,6 +221,21 @@
  			}
  			return ch;
  		}
@@ -80,7 +80,7 @@ Forwarded: no
  }
 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
 +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
-@@ -1220,4 +1220,8 @@
+@@ -1214,4 +1214,8 @@
  		return result;
  	}
  
diff --git a/debian/patches/0042-ignore-money-api.patch b/debian/patches/0042-ignore-money-api.patch
index 8dae4d0..c814167 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
-@@ -491,6 +491,14 @@
+@@ -493,6 +493,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 3bcee2b..ef08e87 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
-@@ -737,6 +737,14 @@
+@@ -740,6 +740,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 137c7ac..d35d6c1 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
-@@ -1056,6 +1056,15 @@
+@@ -1059,6 +1059,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 4112ba3..795b31d 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
-@@ -670,6 +670,14 @@
+@@ -672,6 +672,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

