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 bc8b713c748f5846707827bb8e612512786dd641 Author: Emmanuel Bourg <[email protected]> Date: Sun Apr 3 00:31:33 2016 +0200 Refreshed the patches --- debian/changelog | 16 +++++ debian/patches/0003_no_ibm_websphere.diff | 4 +- debian/patches/0005_commonj.diff | 9 +-- .../0007_remove_backport_util_concurrent.patch | 68 ---------------------- debian/patches/0010_velocity_17.diff | 20 ------- .../0022-ignore-docbook-reference-plugin.patch | 21 ++++--- debian/patches/0026-derby-compatibility.patch | 21 ------- debian/patches/0027-disable-jcache-support.patch | 2 +- debian/patches/0028-disable-jdiff-report.patch | 6 +- debian/patches/0030-tomcat7-compatibility.patch | 39 ++----------- debian/patches/0032-missing-tiles-dependency.patch | 13 ----- .../patches/0033-missing-taglibs-dependency.patch | 14 ----- .../0034-velocity-tools-compatibility.patch | 14 +++++ .../patches/0035-ignore-asciidoctor-plugin.patch | 32 ++++++++++ .../patches/0036-ignore-compilation-warnings.patch | 14 +++++ debian/patches/series | 8 +-- 16 files changed, 108 insertions(+), 193 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4eabe90..b731cce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libspring-java (4.0.9-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + - Removed 0007_remove_backport_util_concurrent.patch (fixed upstream) + - Removed 0010_velocity_17.diff (fixed upstream) + - Removed 0026-derby-compatibility.patch (fixed upstream) + - Removed 0032-missing-tiles-dependency.patch (fixed upstream) + - Removed 0033-missing-taglibs-dependency.patch + - Added a patch fixing the compatibility with velocity-tools 2.0 + - Added a patch to ignore the asciidoctor plugin + - Added a patch to stop failing the build on compilation warnings + + -- Emmanuel Bourg <[email protected]> Mon, 19 Oct 2015 12:56:42 +0200 + libspring-java (3.2.13-5) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff index e90a340..4f34cb6 100644 --- a/debian/patches/0003_no_ibm_websphere.diff +++ b/debian/patches/0003_no_ibm_websphere.diff @@ -4,9 +4,9 @@ Last-Update: 2010-06-20 Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -368,6 +368,15 @@ +@@ -450,6 +450,15 @@ testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") - testCompile("javax.persistence:persistence-api:1.0") + testCompile("org.eclipse.persistence:javax.persistence:2.0.0") } + + sourceSets { diff --git a/debian/patches/0005_commonj.diff b/debian/patches/0005_commonj.diff index 4d024dc..aef40fa 100644 --- a/debian/patches/0005_commonj.diff +++ b/debian/patches/0005_commonj.diff @@ -9,7 +9,7 @@ Forwarded: no --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java -@@ -121,20 +121,22 @@ +@@ -120,20 +120,22 @@ public void execute(Runnable task) { Assert.state(this.workManager != null, "No WorkManager specified"); Work work = new DelegatingWork(task); @@ -33,16 +33,17 @@ Forwarded: no + */ } - public void execute(Runnable task, long startTimeout) { -@@ -165,11 +167,11 @@ - // Implementation of the CommonJ WorkManager interface + @Override +@@ -183,12 +185,12 @@ //------------------------------------------------------------------------- + @Override - public WorkItem schedule(Work work) throws WorkException, IllegalArgumentException { + public WorkItem schedule(Work work) throws IllegalArgumentException { return this.workManager.schedule(work); } + @Override - public WorkItem schedule(Work work, WorkListener workListener) throws WorkException { + public WorkItem schedule(Work work, WorkListener workListener) { return this.workManager.schedule(work, workListener); diff --git a/debian/patches/0007_remove_backport_util_concurrent.patch b/debian/patches/0007_remove_backport_util_concurrent.patch deleted file mode 100644 index 4b644dd..0000000 --- a/debian/patches/0007_remove_backport_util_concurrent.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: Removes the dependency on backport-util-concurrent. - The dependency has been dropped upstream in the recent releases -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java -+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java -@@ -20,9 +20,9 @@ - import java.util.concurrent.Future; - import java.util.concurrent.FutureTask; - --import edu.emory.mathcs.backport.java.util.concurrent.Executor; --import edu.emory.mathcs.backport.java.util.concurrent.Executors; --import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException; -+import java.util.concurrent.Executor; -+import java.util.concurrent.Executors; -+import java.util.concurrent.RejectedExecutionException; - - import org.springframework.core.task.TaskRejectedException; - import org.springframework.scheduling.SchedulingTaskExecutor; ---- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java -+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java -@@ -16,7 +16,7 @@ - - package org.springframework.scheduling.backportconcurrent; - --import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory; -+import java.util.concurrent.ThreadFactory; - - import org.springframework.util.CustomizableThreadCreator; - ---- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java -+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java -@@ -20,15 +20,15 @@ - import java.util.concurrent.Future; - import java.util.concurrent.FutureTask; - --import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue; --import edu.emory.mathcs.backport.java.util.concurrent.Executor; --import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; --import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException; --import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionHandler; --import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue; --import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory; --import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor; --import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; -+import java.util.concurrent.BlockingQueue; -+import java.util.concurrent.Executor; -+import java.util.concurrent.LinkedBlockingQueue; -+import java.util.concurrent.RejectedExecutionException; -+import java.util.concurrent.RejectedExecutionHandler; -+import java.util.concurrent.SynchronousQueue; -+import java.util.concurrent.ThreadFactory; -+import java.util.concurrent.ThreadPoolExecutor; -+import java.util.concurrent.TimeUnit; - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - ---- a/build.gradle -+++ b/build.gradle -@@ -330,7 +330,7 @@ - optional("javax.inject:javax.inject:1") - optional("javax.ejb:ejb-api:3.0") - optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1") -- optional("backport-util-concurrent:backport-util-concurrent:3.0") -+ //optional("backport-util-concurrent:backport-util-concurrent:3.0") - optional("javax.persistence:persistence-api:1.0") - optional("javax.validation:validation-api:1.0.0.GA") - optional("org.hibernate:hibernate-validator:4.3.1.Final") diff --git a/debian/patches/0010_velocity_17.diff b/debian/patches/0010_velocity_17.diff deleted file mode 100644 index 4a75cea..0000000 --- a/debian/patches/0010_velocity_17.diff +++ /dev/null @@ -1,20 +0,0 @@ -Description: Compatibility with Velocity 1.7 API -Author: Miguel Landaeta <[email protected]> -Bug-Debian: http://bugs.debian.org/655812 -Forwarded: no -Last-Update: 2012-01-14 - ---- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java -+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java -@@ -250,9 +250,11 @@ public class VelocityEngineFactory { - // Perform actual initialization. - velocityEngine.init(); - } -+ /* Since Velocity 1.7 initialization call doesn't throw IOExceptions - catch (IOException ex) { - throw ex; - } -+ */ - catch (VelocityException ex) { - throw ex; - } diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch index 11ab9dc..97c1197 100644 --- a/debian/patches/0022-ignore-docbook-reference-plugin.patch +++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch @@ -4,25 +4,28 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -851,17 +851,11 @@ - configure(rootProject) { +@@ -981,7 +981,6 @@ description = "Spring Framework" + apply plugin: "asciidoctor" - apply plugin: "docbook-reference" apply plugin: "groovy" // apply plugin: "detect-split-packages" - apply from: "${gradleScriptDir}/jdiff.gradle" +@@ -1001,12 +1000,6 @@ + ] + } - reference { -- sourceDir = file("src/reference/docbook") +- sourceDir = asciidoctor.outputDir - pdfFilename = "spring-framework-reference.pdf" +- expandPlaceholders = "" - } - - // TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File. - // TODO: Possibly related to user rights or OS differences on OpenJDK 8; works fine on JDK 7. - // detectSplitPackages { -@@ -933,7 +927,7 @@ + afterEvaluate { + tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") } + } +@@ -1080,7 +1073,7 @@ } } @@ -31,7 +34,7 @@ Forwarded: not-needed group = "Distribution" baseName = "spring-framework" classifier = "docs" -@@ -947,10 +941,6 @@ +@@ -1094,10 +1087,6 @@ from (api) { into "javadoc-api" } diff --git a/debian/patches/0026-derby-compatibility.patch b/debian/patches/0026-derby-compatibility.patch deleted file mode 100644 index 6076f62..0000000 --- a/debian/patches/0026-derby-compatibility.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Compile with the version of Derby in Debian -Origin: backport, https://github.com/spring-projects/spring-framework/commit/b4d6e27 ---- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java -+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java -@@ -84,16 +84,6 @@ - logger.warn("Could not shutdown in-memory Derby database", ex); - return; - } -- if (!isAtLeastDotSix) { -- // Explicitly purge the in-memory database, to prevent it -- // from hanging around after being shut down. -- try { -- VFMemoryStorageFactory.purgeDatabase(new File(databaseName).getCanonicalPath()); -- } -- catch (IOException ex2) { -- logger.warn("Could not purge in-memory Derby database", ex2); -- } -- } - } - } - diff --git a/debian/patches/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch index 0be6fc8..04f6300 100644 --- a/debian/patches/0027-disable-jcache-support.patch +++ b/debian/patches/0027-disable-jcache-support.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -481,6 +481,15 @@ +@@ -568,6 +568,15 @@ // pick up **/*.types files in src/main sourceSets.main.resources.srcDirs += "src/main/java" diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch index 879defc..bf669b7 100644 --- a/debian/patches/0028-disable-jdiff-report.patch +++ b/debian/patches/0028-disable-jdiff-report.patch @@ -3,12 +3,12 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -863,7 +863,7 @@ +@@ -993,7 +993,7 @@ apply plugin: "groovy" // apply plugin: "detect-split-packages" - apply from: "${gradleScriptDir}/jdiff.gradle" + //apply from: "${gradleScriptDir}/jdiff.gradle" - // TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File. - // TODO: Possibly related to user rights or OS differences on OpenJDK 8; works fine on JDK 7. + asciidoctor { + baseDir = project.file('src/asciidoc') diff --git a/debian/patches/0030-tomcat7-compatibility.patch b/debian/patches/0030-tomcat7-compatibility.patch index 8fa8136..040995b 100644 --- a/debian/patches/0030-tomcat7-compatibility.patch +++ b/debian/patches/0030-tomcat7-compatibility.patch @@ -59,37 +59,17 @@ Last-Update: 2015-08-16 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -@@ -30,11 +30,10 @@ - * to loaded classes without the need to use a VM-wide agent. - * - * <p>To be registered using a -- * {@code <a href="http://tomcat.apache.org/tomcat-5.5-doc/config/loader.html";>Loader</a>} tag -- * in Tomcat's {@code <a href="http://tomcat.apache.org/tomcat-5.5-doc/config/context.html";>Context</a>} -+ * {@code <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/loader.html";>Loader</a>} tag -+ * in Tomcat's {@code <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/context.html";>Context</a>} - * definition in the {@code server.xml} file, with the Spring-provided "spring-instrument-tomcat.jar" -- * file deployed into Tomcat's "server/lib" (for Tomcat 5.x) or "lib" (for Tomcat 6.x) directory. -- * The required configuration tag looks as follows: -+ * file deployed into Tomcat's "lib" directory. The required configuration tag looks as follows: - * - * <pre class="code"><Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/></pre> - * -@@ -44,10 +43,10 @@ - * {@code getThrowawayClassLoader} methods mirror the corresponding methods +@@ -44,6 +44,9 @@ * in the LoadTimeWeaver interface, as expected by ReflectiveLoadTimeWeaver. * -- * <p>See the PetClinic sample application for a full example of this -- * ClassLoader in action. -- * -- * <p><b>NOTE:</b> Requires Apache Tomcat version 5.0 or higher. -+ * <p><b>NOTE:</b> Requires Apache Tomcat version 6.0 or higher, as of Spring 4.0. + * <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 -@@ -55,6 +54,7 @@ +@@ -51,6 +54,7 @@ * @see #addTransformer * @see #getThrowawayClassLoader * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver @@ -97,14 +77,7 @@ Last-Update: 2015-08-16 */ public class TomcatInstrumentableClassLoader extends WebappClassLoader { -@@ -103,13 +103,13 @@ - */ - public ClassLoader getThrowawayClassLoader() { - WebappClassLoader tempLoader = new WebappClassLoader(); -- // Use reflection to copy all the fields since most of them are private on pre-5.5 Tomcat. -+ // Use reflection to copy all the fields since they are not exposed any other way. - shallowCopyFieldState(this, tempLoader); - return tempLoader; +@@ -105,7 +109,7 @@ } @@ -113,7 +86,7 @@ Last-Update: 2015-08-16 protected ResourceEntry findResourceInternal(String name, String path) { ResourceEntry entry = super.findResourceInternal(name, path); if (entry != null && entry.binaryContent != null && path.endsWith(CLASS_SUFFIX)) { -@@ -119,11 +119,19 @@ +@@ -115,11 +119,19 @@ return entry; } @@ -138,7 +111,7 @@ Last-Update: 2015-08-16 --- a/build.gradle +++ b/build.gradle -@@ -315,6 +315,10 @@ +@@ -360,6 +360,10 @@ dependencies { provided("org.apache.tomcat:catalina:6.0.16") } diff --git a/debian/patches/0032-missing-tiles-dependency.patch b/debian/patches/0032-missing-tiles-dependency.patch deleted file mode 100644 index abe68e4..0000000 --- a/debian/patches/0032-missing-tiles-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Add the missing dependency on tiles-el -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/build.gradle -+++ b/build.gradle -@@ -618,6 +618,7 @@ - optional("rome:rome:1.0") - optional("org.apache.tiles:tiles-api:2.1.2") - optional("org.apache.tiles:tiles-core:2.1.2") -+ optional("org.apache.tiles:tiles-el:2.1.2") - optional("org.apache.tiles:tiles-jsp:2.1.2") - optional("org.apache.tiles:tiles-servlet:2.1.2") - testCompile(project(":spring-aop")) diff --git a/debian/patches/0033-missing-taglibs-dependency.patch b/debian/patches/0033-missing-taglibs-dependency.patch deleted file mode 100644 index c6fb109..0000000 --- a/debian/patches/0033-missing-taglibs-dependency.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Add a missing dependency on the taglibs -Author: Emmanuel Bourg <[email protected]> -Forwarded: no - ---- a/build.gradle -+++ b/build.gradle -@@ -722,6 +722,7 @@ - optional("javax.servlet:jstl:1.2") - optional("javax.portlet:portlet-api:2.0") - optional("javax.persistence:persistence-api:1.0") -+ optional("taglibs:standard:1.1.2") - optional("org.aspectj:aspectjweaver:${aspectjVersion}") - testCompile("org.hibernate:hibernate-core:3.3.2.GA") - testCompile("hsqldb:hsqldb:${hsqldbVersion}") diff --git a/debian/patches/0034-velocity-tools-compatibility.patch b/debian/patches/0034-velocity-tools-compatibility.patch new file mode 100644 index 0000000..55f820b --- /dev/null +++ b/debian/patches/0034-velocity-tools-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fix the compatibility with the version of velocity-tools in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java ++++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java +@@ -108,7 +108,7 @@ + if (getToolboxConfigLocation() != null) { + ToolboxManager toolboxManager = ServletToolboxManager.getInstance( + getServletContext(), getToolboxConfigLocation()); +- Map<?, ?> toolboxContext = toolboxManager.getToolbox(velocityContext); ++ Map toolboxContext = toolboxManager.getToolbox(velocityContext); + velocityContext.setToolbox(toolboxContext); + } + diff --git a/debian/patches/0035-ignore-asciidoctor-plugin.patch b/debian/patches/0035-ignore-asciidoctor-plugin.patch new file mode 100644 index 0000000..0691322 --- /dev/null +++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch @@ -0,0 +1,32 @@ +Description: Ignore the asciidoctor plugin (not in Debian) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.gradle ++++ b/build.gradle +@@ -993,26 +993,11 @@ + configure(rootProject) { + description = "Spring Framework" + +- apply plugin: "asciidoctor" + 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 : "" +- ] +- ] +- } +- + afterEvaluate { + tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") } + } diff --git a/debian/patches/0036-ignore-compilation-warnings.patch b/debian/patches/0036-ignore-compilation-warnings.patch new file mode 100644 index 0000000..24c2906 --- /dev/null +++ b/debian/patches/0036-ignore-compilation-warnings.patch @@ -0,0 +1,14 @@ +Description: Do not fail the build on compilation warnings +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/build.gradle ++++ b/build.gradle +@@ -51,7 +51,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", +- "-Xlint:unchecked", "-Xlint:-options", "-Werror" ++ "-Xlint:unchecked", "-Xlint:-options" + ] + + compileTestJava.options*.compilerArgs = [ diff --git a/debian/patches/series b/debian/patches/series index ee6d755..be95e70 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,12 +1,10 @@ 0003_no_ibm_websphere.diff 0005_commonj.diff -0007_remove_backport_util_concurrent.patch -0010_velocity_17.diff 0022-ignore-docbook-reference-plugin.patch -0026-derby-compatibility.patch 0027-disable-jcache-support.patch 0028-disable-jdiff-report.patch 0030-tomcat7-compatibility.patch 0031-gradle2-compatibility.patch -0032-missing-tiles-dependency.patch -0033-missing-taglibs-dependency.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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
