[libspring-java] 02/13: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Aug 3 17:51:38 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 3793316ce7f9c2aba11127cbb693c7aa9dc9bec8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue May 31 13:50:40 2016 +0200
Refreshed the patches
---
debian/changelog | 8 ++
debian/patches/0003_no_ibm_websphere.diff | 2 +-
.../0022-ignore-docbook-reference-plugin.patch | 12 +-
debian/patches/0028-disable-jdiff-report.patch | 4 +-
debian/patches/0030-tomcat7-compatibility.patch | 124 ---------------------
.../patches/0035-ignore-asciidoctor-plugin.patch | 30 +++--
.../patches/0036-ignore-compilation-warnings.patch | 2 +-
debian/patches/0037-ignore-sonar-plugin.patch | 4 +-
debian/patches/0039-openjpa-compatibility.patch | 6 +-
debian/patches/0040-ignore-json-assert.patch | 35 ++++--
.../patches/0041-servlet-api-compatibility.patch | 33 +-----
debian/patches/series | 1 -
12 files changed, 69 insertions(+), 192 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 64f0d21..e902590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-java (4.2.6-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 24 May 2016 15:19:05 +0200
+
libspring-java (4.1.9-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index 5a12c5d..949d874 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
-@@ -524,6 +524,15 @@
+@@ -545,6 +545,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 37d4354..69ac08a 100644
--- a/debian/patches/0022-ignore-docbook-reference-plugin.patch
+++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch
@@ -4,16 +4,16 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1112,7 +1112,6 @@
+@@ -1154,7 +1154,6 @@
description = "Spring Framework"
- apply plugin: "asciidoctor"
+ apply plugin: "org.asciidoctor.convert"
- apply plugin: "docbook-reference"
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
-@@ -1132,13 +1131,6 @@
- ]
+@@ -1168,13 +1167,6 @@
+ attributes 'spring-version': project.version, 'revnumber': project.version, 'docinfo': ""
}
- reference {
@@ -26,7 +26,7 @@ Forwarded: not-needed
afterEvaluate {
tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
}
-@@ -1212,7 +1204,7 @@
+@@ -1248,7 +1240,7 @@
}
}
@@ -35,7 +35,7 @@ Forwarded: not-needed
group = "Distribution"
baseName = "spring-framework"
classifier = "docs"
-@@ -1226,10 +1218,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 79295f7..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
-@@ -1124,7 +1124,7 @@
+@@ -1157,7 +1157,7 @@
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
@@ -11,4 +11,4 @@ Forwarded: not-needed
+ //apply from: "${gradleScriptDir}/jdiff.gradle"
asciidoctor {
- baseDir = project.file('src/asciidoc')
+ sourceDir project.file('src/asciidoc')
diff --git a/debian/patches/0030-tomcat7-compatibility.patch b/debian/patches/0030-tomcat7-compatibility.patch
deleted file mode 100644
index 40581cf..0000000
--- a/debian/patches/0030-tomcat7-compatibility.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Description: Add support for Tomcat 7.0.63+
-Author: Juergen Hoeller <jhoeller at pivotal.io>
-Origin: upstream, https://github.com/spring-projects/spring-framework/commit/37f74e76f674e175813f36d3562a9333d7c6654e
-Last-Update: 2015-08-16
-
---- /dev/null
-+++ b/spring-instrument-tomcat/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright 2002-2015 the original author or authors.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package org.apache.catalina.loader;
-+
-+/**
-+ * A mock of Tomcat's {@code WebappClassLoader} just for Spring's compilation purposes.
-+ * Exposes both pre-7.0.63 as well as 7.0.63+ variants of {@code findResourceInternal}.
-+ *
-+ * @author Juergen Hoeller
-+ * @since 4.2
-+ */
-+public class WebappClassLoader extends ClassLoader {
-+
-+ public WebappClassLoader() {
-+ }
-+
-+ public WebappClassLoader(ClassLoader parent) {
-+ super(parent);
-+ }
-+
-+
-+ protected ResourceEntry findResourceInternal(String name, String path) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ protected ResourceEntry findResourceInternal(String name, String path, boolean manifestRequired) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+}
---- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
-+++ b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2002-2013 the original author or authors.
-+ * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -44,6 +44,9 @@
- * in the LoadTimeWeaver interface, as expected by ReflectiveLoadTimeWeaver.
- *
- * <p><b>NOTE:</b> Requires Apache Tomcat version 6.0 or higher, as of Spring 4.0.
-+ * This class is not intended to work on Tomcat 8.0+; please rely on Tomcat's own
-+ * {@code InstrumentableClassLoader} facility instead, as autodetected by Spring's
-+ * {@link org.springframework.instrument.classloading.tomcat.TomcatLoadTimeWeaver}.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
-@@ -51,6 +54,7 @@
- * @see #addTransformer
- * @see #getThrowawayClassLoader
- * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
-+ * @see org.springframework.instrument.classloading.tomcat.TomcatLoadTimeWeaver
- */
- public class TomcatInstrumentableClassLoader extends WebappClassLoader {
-
-@@ -105,7 +109,7 @@
- }
-
-
-- @Override
-+ @Override // overriding the pre-7.0.63 variant of findResourceInternal
- protected ResourceEntry findResourceInternal(String name, String path) {
- ResourceEntry entry = super.findResourceInternal(name, path);
- if (entry != null && entry.binaryContent != null && path.endsWith(CLASS_SUFFIX)) {
-@@ -115,11 +119,19 @@
- return entry;
- }
-
-+ @Override // overriding the 7.0.63+ variant of findResourceInternal
-+ protected ResourceEntry findResourceInternal(String name, String path, boolean manifestRequired) {
-+ ResourceEntry entry = super.findResourceInternal(name, path, manifestRequired);
-+ if (entry != null && entry.binaryContent != null && path.endsWith(CLASS_SUFFIX)) {
-+ String className = (name.endsWith(CLASS_SUFFIX) ? name.substring(0, name.length() - CLASS_SUFFIX.length()) : name);
-+ entry.binaryContent = this.weavingTransformer.transformIfNecessary(className, entry.binaryContent);
-+ }
-+ return entry;
-+ }
-+
- @Override
- public String toString() {
-- StringBuilder sb = new StringBuilder(getClass().getName());
-- sb.append("\r\n").append(super.toString());
-- return sb.toString();
-+ return getClass().getName() + "\r\n" + super.toString();
- }
-
-
---- a/build.gradle
-+++ b/build.gradle
-@@ -436,6 +436,10 @@
- dependencies {
- provided("org.apache.tomcat:catalina:6.0.16")
- }
-+
-+ jar {
-+ exclude("org/apache/**") // exclude the mock used to bridge between pre-7.0.63 and 7.0.63+
-+ }
- }
-
- project("spring-context") {
diff --git a/debian/patches/0035-ignore-asciidoctor-plugin.patch b/debian/patches/0035-ignore-asciidoctor-plugin.patch
index 167c332..d6d8a74 100644
--- a/debian/patches/0035-ignore-asciidoctor-plugin.patch
+++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch
@@ -3,30 +3,28 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1124,26 +1124,11 @@
+@@ -1153,24 +1153,11 @@
configure(rootProject) {
description = "Spring Framework"
-- apply plugin: "asciidoctor"
+- apply plugin: "org.asciidoctor.convert"
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
//apply from: "${gradleScriptDir}/jdiff.gradle"
- asciidoctor {
-- baseDir = project.file('src/asciidoc')
-- backend = 'docbook5'
-- options = [
-- eruby: 'erubis',
-- attributes: [
-- doctype: 'book',
-- 'spring-version' : project.version,
-- revnumber : project.version,
-- docinfo : ""
-- ]
-- ]
+- sourceDir project.file('src/asciidoc')
+- separateOutputDirs = false
+- backends = ['docbook']
+- options doctype: 'book', eruby: 'erubis'
+- attributes 'spring-version': project.version, 'revnumber': project.version, 'docinfo': ""
- }
-
- afterEvaluate {
- tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
- }
+- afterEvaluate {
+- tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
+- }
+-
+ // TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File.
+ // TODO: Possibly related to user rights or OS differences; passes on local Windows machine.
+ // detectSplitPackages {
diff --git a/debian/patches/0036-ignore-compilation-warnings.patch b/debian/patches/0036-ignore-compilation-warnings.patch
index f4781ae..6c2e4bb 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
-@@ -75,7 +75,7 @@
+@@ -90,7 +90,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 8fb54ca..d63b36e 100644
--- a/debian/patches/0037-ignore-sonar-plugin.patch
+++ b/debian/patches/0037-ignore-sonar-plugin.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1105,22 +1105,6 @@
+@@ -1134,22 +1134,6 @@
}
}
@@ -26,7 +26,7 @@ Forwarded: not-needed
configure(rootProject) {
description = "Spring Framework"
-@@ -1340,21 +1324,6 @@
+@@ -1365,21 +1349,6 @@
}
diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch
index 818fecc..a633252 100644
--- a/debian/patches/0039-openjpa-compatibility.patch
+++ b/debian/patches/0039-openjpa-compatibility.patch
@@ -3,11 +3,11 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -803,6 +803,7 @@
+@@ -765,6 +765,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'
}
-+ optional("org.apache.openjpa:openjpa-persistence-jdbc:${openJpaVersion}")
- optional("javax.jdo:jdo-api:3.0.1") {
++ optional("org.apache.openjpa:openjpa-persistence-jdbc:${openjpaVersion}")
+ optional("javax.jdo:jdo-api:3.1") {
exclude group: 'javax.transaction', module: 'transaction-api'
}
diff --git a/debian/patches/0040-ignore-json-assert.patch b/debian/patches/0040-ignore-json-assert.patch
index ad0996a..ad72bc5 100644
--- a/debian/patches/0040-ignore-json-assert.patch
+++ b/debian/patches/0040-ignore-json-assert.patch
@@ -12,20 +12,39 @@ Forwarded: not-needed
/**
* A helper class for assertions on JSON content.
-@@ -39,7 +39,7 @@
- * @since 4.1
+@@ -41,7 +41,7 @@
+ * @see #assertJsonEqual(String, String, boolean)
*/
public void assertJsonEqual(String expected, String actual) throws Exception {
-- JSONAssert.assertEquals(expected, actual, false);
-+ //JSONAssert.assertEquals(expected, actual, false);
+- assertJsonEqual(expected, actual, false);
++// assertJsonEqual(expected, actual, false);
}
/**
-@@ -52,6 +52,6 @@
- * @since 4.1
+@@ -61,7 +61,7 @@
+ * @since 4.2
+ */
+ public void assertJsonEqual(String expected, String actual, boolean strict) throws Exception {
+- JSONAssert.assertEquals(expected, actual, strict);
++// JSONAssert.assertEquals(expected, actual, strict);
+ }
+
+ /**
+@@ -76,7 +76,7 @@
+ * @see #assertJsonNotEqual(String, String, boolean)
*/
public void assertJsonNotEqual(String expected, String actual) throws Exception {
-- JSONAssert.assertNotEquals(expected, actual, false);
-+ //JSONAssert.assertNotEquals(expected, actual, false);
+- assertJsonNotEqual(expected, actual, false);
++// assertJsonNotEqual(expected, actual, false);
}
+
+ /**
+@@ -96,7 +96,7 @@
+ * @since 4.2
+ */
+ public void assertJsonNotEqual(String expected, String actual, boolean strict) throws Exception {
+- JSONAssert.assertNotEquals(expected, actual, strict);
++// JSONAssert.assertNotEquals(expected, actual, strict);
+ }
+
}
diff --git a/debian/patches/0041-servlet-api-compatibility.patch b/debian/patches/0041-servlet-api-compatibility.patch
index f6ea20a..afaa761 100644
--- a/debian/patches/0041-servlet-api-compatibility.patch
+++ b/debian/patches/0041-servlet-api-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
-@@ -197,6 +197,14 @@
+@@ -237,6 +237,14 @@
public void write(byte[] b, int off, int len) throws IOException {
content.write(b, off, len);
}
@@ -42,29 +42,6 @@ Forwarded: no
}
}
---- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
-+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
-@@ -152,6 +152,20 @@
- super.close();
- pushbackInputStream.close();
- }
-+ @Override
-+ public boolean isReady() {
-+ try {
-+ return pushbackInputStream.available() > 0;
-+ } catch (IOException e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+ @Override
-+ public boolean isFinished() {
-+ return false;
-+ }
-+ @Override
-+ public void setReadListener(javax.servlet.ReadListener listener) { }
- };
- }
- };
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -65,4 +65,17 @@
@@ -103,8 +80,8 @@ 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
-@@ -1160,4 +1160,8 @@
- return this.parts.values();
+@@ -1220,4 +1220,8 @@
+ return result;
}
+ @Override
@@ -114,8 +91,8 @@ Forwarded: no
}
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
-@@ -692,4 +692,8 @@
- }
+@@ -680,4 +680,8 @@
+ throw new UnsupportedOperationException();
}
+ @Override
diff --git a/debian/patches/series b/debian/patches/series
index 3d900c5..01a4b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
0005_commonj.diff
0022-ignore-docbook-reference-plugin.patch
0028-disable-jdiff-report.patch
-0030-tomcat7-compatibility.patch
0034-velocity-tools-compatibility.patch
0035-ignore-asciidoctor-plugin.patch
0036-ignore-compilation-warnings.patch
--
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