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 8e19bfb5da8f4ab7e6d159f1730b59766ac32720 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 3 15:15:55 2014 +0100 Updated the patch removing backport-util-concurrent --- .../0007_remove_backport_util_concurrent.patch | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/patches/0007_remove_backport_util_concurrent.patch b/debian/patches/0007_remove_backport_util_concurrent.patch index b4da7e9..4b644dd 100644 --- a/debian/patches/0007_remove_backport_util_concurrent.patch +++ b/debian/patches/0007_remove_backport_util_concurrent.patch @@ -2,8 +2,8 @@ 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/projects/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java -+++ b/projects/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java +--- 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; @@ -17,8 +17,8 @@ Forwarded: not-needed import org.springframework.core.task.TaskRejectedException; import org.springframework.scheduling.SchedulingTaskExecutor; ---- a/projects/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java -+++ b/projects/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java +--- 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; @@ -28,8 +28,8 @@ Forwarded: not-needed import org.springframework.util.CustomizableThreadCreator; ---- a/projects/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java -+++ b/projects/org.springframework.context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java +--- 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; @@ -55,3 +55,14 @@ Forwarded: not-needed 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") -- 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
