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 898d2c0a01670ddf449ed5e1e4b2b60f66dd5bb7 Author: Emmanuel Bourg <[email protected]> Date: Wed Sep 25 17:11:51 2013 +0200 Removed the dependency on backport-util-concurrent --- debian/build-classpath | 1 - debian/changelog | 1 + debian/control | 4 +- debian/patches/0001_use_debian_asm3.diff | 98 +++++++------------- .../0007_remove_backport_util_concurrent.patch | 57 ++++++++++++ debian/patches/series | 1 + 6 files changed, 94 insertions(+), 68 deletions(-) diff --git a/debian/build-classpath b/debian/build-classpath index 4474e22..47e5538 100644 --- a/debian/build-classpath +++ b/debian/build-classpath @@ -14,7 +14,6 @@ /usr/share/java/aspectjweaver.jar /usr/share/java/atinject-jsr330-api.jar /usr/share/java/axis-jaxrpc.jar -/usr/share/java/backport-util-concurrent.jar /usr/share/java/bsh.jar /usr/share/java/c3p0.jar /usr/share/java/castor-core.jar diff --git a/debian/changelog b/debian/changelog index ea70acc..72a2b1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libspring-java (3.0.6.RELEASE-8) UNRELEASED; urgency=low * Team upload. * Updated debian/watch to fetch the tarball from Github + * Removed the dependency on backport-util-concurrent -- Emmanuel Bourg <[email protected]> Wed, 25 Sep 2013 16:36:22 +0200 diff --git a/debian/control b/debian/control index e84e6ba..d262c3f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk (>= 1:1.6) Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts, libaspectj-java, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials, groovy, junit4 (>= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java, - libaxis-java, libbackport-util-concurrent-java, libc3p0-java, libcastor-core-java, libcastor-xml-java, + libaxis-java, libc3p0-java, libcastor-core-java, libcastor-xml-java, libcglib-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-logging-java, libcommons-pool-java, libdom4j-java, libecj-java, libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java, @@ -64,7 +64,7 @@ Description: modular Java/J2EE application framework - AOP Package: libspring-context-java Architecture: all Depends: ${misc:Depends}, libspring-aop-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-core-java (= ${source:Version}), libspring-expression-java (= ${source:Version}) -Recommends: libspring-instrument-java (= ${source:Version}), libbackport-util-concurrent-java, libtomcat6-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee, +Recommends: libspring-instrument-java (= ${source:Version}), libtomcat6-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee, libjodatime-java, libasm3-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java Suggests: jruby, bsh, groovy Description: modular Java/J2EE application framework - Context diff --git a/debian/patches/0001_use_debian_asm3.diff b/debian/patches/0001_use_debian_asm3.diff index 7ae4b52..b453755 100644 --- a/debian/patches/0001_use_debian_asm3.diff +++ b/debian/patches/0001_use_debian_asm3.diff @@ -5,10 +5,8 @@ Description: Use ASM 3.x debian package instead of CGLIB-nodep: Author: Damien Raude-Morvan <[email protected]> Last-Update: 2011-08-20 Forwarded: no -Index: libspring-java/projects/build-spring-framework/build.xml -=================================================================== ---- libspring-java.orig/projects/build-spring-framework/build.xml 2010-11-05 15:02:39.000000000 -0430 -+++ libspring-java/projects/build-spring-framework/build.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/build-spring-framework/build.xml ++++ b/projects/build-spring-framework/build.xml @@ -25,7 +25,6 @@ <path id="bundles"> @@ -17,10 +15,8 @@ Index: libspring-java/projects/build-spring-framework/build.xml <path refid="unit.test.bundles" /> <pathelement location="../org.springframework.integration-tests"/> <pathelement location="../org.springframework.spring-library"/> -Index: libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java 2010-11-05 15:02:39.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java ++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java @@ -28,12 +28,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,10 +45,8 @@ Index: libspring-java/projects/org.springframework.core/src/main/java/org/spring return map; } catch (IOException ex) { -Index: libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java ++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java @@ -16,13 +16,13 @@ package org.springframework.core.type.classreading; @@ -74,10 +68,8 @@ Index: libspring-java/projects/org.springframework.core/src/main/java/org/spring import org.springframework.core.type.ClassMetadata; import org.springframework.util.ClassUtils; -Index: libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java ++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java @@ -25,9 +25,9 @@ import java.util.Map; import java.util.Set; @@ -91,10 +83,8 @@ Index: libspring-java/projects/org.springframework.core/src/main/java/org/spring import org.springframework.core.annotation.AnnotationUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; -Index: libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java ++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set; @@ -108,10 +98,8 @@ Index: libspring-java/projects/org.springframework.core/src/main/java/org/spring import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.MethodMetadata; import org.springframework.util.CollectionUtils; -Index: libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java ++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java @@ -19,11 +19,11 @@ import java.util.LinkedHashMap; import java.util.Map; @@ -136,10 +124,8 @@ Index: libspring-java/projects/org.springframework.core/src/main/java/org/spring -} \ No newline at end of file +} -Index: libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java ++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.InputStream; @@ -165,10 +151,8 @@ Index: libspring-java/projects/org.springframework.core/src/main/java/org/spring -} \ No newline at end of file +} -Index: libspring-java/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java -=================================================================== ---- libspring-java.orig/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java ++++ b/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.Map; @@ -178,10 +162,8 @@ Index: libspring-java/projects/org.springframework.context/src/main/java/org/spr import net.sf.cglib.core.Signature; import net.sf.cglib.proxy.InterfaceMaker; import org.apache.commons.logging.Log; -Index: libspring-java/projects/org.springframework.aop/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.aop/ivy.xml 2010-11-05 15:02:39.000000000 -0430 -+++ libspring-java/projects/org.springframework.aop/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.aop/ivy.xml ++++ b/projects/org.springframework.aop/ivy.xml @@ -38,7 +38,7 @@ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/> <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/> @@ -191,10 +173,8 @@ Index: libspring-java/projects/org.springframework.aop/ivy.xml </dependencies> </ivy-module> -Index: libspring-java/projects/org.springframework.beans/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.beans/ivy.xml 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.beans/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.beans/ivy.xml ++++ b/projects/org.springframework.beans/ivy.xml @@ -32,7 +32,7 @@ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/> @@ -204,10 +184,8 @@ Index: libspring-java/projects/org.springframework.beans/ivy.xml </dependencies> </ivy-module> -Index: libspring-java/projects/org.springframework.context/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.context/ivy.xml 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.context/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.context/ivy.xml ++++ b/projects/org.springframework.context/ivy.xml @@ -51,7 +51,7 @@ <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="optional->compile"/> <dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/> @@ -217,10 +195,8 @@ Index: libspring-java/projects/org.springframework.context/ivy.xml <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/> <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/> <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/> -Index: libspring-java/projects/org.springframework.core/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.core/ivy.xml 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.core/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.core/ivy.xml ++++ b/projects/org.springframework.core/ivy.xml @@ -28,7 +28,7 @@ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/> <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/> @@ -230,10 +206,8 @@ Index: libspring-java/projects/org.springframework.core/ivy.xml <!-- test dependencies --> <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/> -Index: libspring-java/projects/org.springframework.integration-tests/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.integration-tests/ivy.xml 2010-11-05 15:02:40.000000000 -0430 -+++ libspring-java/projects/org.springframework.integration-tests/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.integration-tests/ivy.xml ++++ b/projects/org.springframework.integration-tests/ivy.xml @@ -75,7 +75,7 @@ <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/> <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/> @@ -243,10 +217,8 @@ Index: libspring-java/projects/org.springframework.integration-tests/ivy.xml <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/> <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/> <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->compile"/> -Index: libspring-java/projects/org.springframework.spring-library/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.spring-library/ivy.xml 2010-11-05 15:02:39.000000000 -0430 -+++ libspring-java/projects/org.springframework.spring-library/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.spring-library/ivy.xml ++++ b/projects/org.springframework.spring-library/ivy.xml @@ -21,7 +21,7 @@ <dependencies> @@ -256,10 +228,8 @@ Index: libspring-java/projects/org.springframework.spring-library/ivy.xml <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/> <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/> <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile"/> -Index: libspring-java/projects/org.springframework.web.portlet/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.web.portlet/ivy.xml 2010-11-05 15:02:39.000000000 -0430 -+++ libspring-java/projects/org.springframework.web.portlet/ivy.xml 2010-11-05 15:07:28.000000000 -0430 +--- a/projects/org.springframework.web.portlet/ivy.xml ++++ b/projects/org.springframework.web.portlet/ivy.xml @@ -35,7 +35,7 @@ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/> <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/> @@ -269,11 +239,9 @@ Index: libspring-java/projects/org.springframework.web.portlet/ivy.xml <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/> </dependencies> -Index: libspring-java/projects/org.springframework.web.servlet/ivy.xml -=================================================================== ---- libspring-java.orig/projects/org.springframework.web.servlet/ivy.xml 2010-11-05 15:02:39.000000000 -0430 -+++ libspring-java/projects/org.springframework.web.servlet/ivy.xml 2010-11-05 15:07:28.000000000 -0430 -@@ -85,8 +85,8 @@ +--- a/projects/org.springframework.web.servlet/ivy.xml ++++ b/projects/org.springframework.web.servlet/ivy.xml +@@ -84,8 +84,8 @@ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/> <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="test->compile"/> diff --git a/debian/patches/0007_remove_backport_util_concurrent.patch b/debian/patches/0007_remove_backport_util_concurrent.patch new file mode 100644 index 0000000..b4da7e9 --- /dev/null +++ b/debian/patches/0007_remove_backport_util_concurrent.patch @@ -0,0 +1,57 @@ +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 +@@ -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/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 +@@ -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/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 +@@ -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; + diff --git a/debian/patches/series b/debian/patches/series index 25a18e1..6365123 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,7 @@ 0004_no_derby_db.diff 0005_commonj.diff 0006_aspectj_classpath.diff +0007_remove_backport_util_concurrent.patch 0008_jpa_20_api.diff 0009_hibernate_validator_41.diff 0010_velocity_17.diff -- 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
