Author: nomadium-guest Date: 2010-11-06 18:27:05 +0000 (Sat, 06 Nov 2010) New Revision: 13063
Modified: trunk/libspring-java/debian/changelog trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff Log: * New upstream release. * Refresh patches. Modified: trunk/libspring-java/debian/changelog =================================================================== --- trunk/libspring-java/debian/changelog 2010-11-04 21:50:59 UTC (rev 13062) +++ trunk/libspring-java/debian/changelog 2010-11-06 18:27:05 UTC (rev 13063) @@ -1,3 +1,10 @@ +libspring-java (3.0.5.RELEASE-1) UNRELEASED; urgency=low + + * New upstream release. + * Refresh patches. + + -- Miguel Landaeta <[email protected]> Fri, 05 Nov 2010 19:46:25 -0430 + libspring-java (3.0.4.RELEASE-1) experimental; urgency=low * New major upstream release. Modified: trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff =================================================================== --- trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff 2010-11-04 21:50:59 UTC (rev 13062) +++ trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff 2010-11-06 18:27:05 UTC (rev 13063) @@ -5,8 +5,10 @@ Author: Damien Raude-Morvan <[email protected]> Last-Update: 2010-06-20 Forwarded: no ---- a/projects/build-spring-framework/build.xml -+++ b/projects/build-spring-framework/build.xml +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 @@ -25,7 +25,6 @@ <path id="bundles"> @@ -15,8 +17,10 @@ <path refid="unit.test.bundles" /> <pathelement location="../org.springframework.integration-tests"/> <pathelement location="../org.springframework.spring-library"/> ---- 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 +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 @@ -28,12 +28,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,8 +49,10 @@ return map; } catch (IOException ex) { ---- 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 +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 @@ -16,13 +16,13 @@ package org.springframework.core.type.classreading; @@ -68,8 +74,10 @@ import org.springframework.core.type.ClassMetadata; import org.springframework.util.ClassUtils; ---- 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 +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 @@ -25,9 +25,9 @@ import java.util.Map; import java.util.Set; @@ -83,8 +91,10 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; ---- 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 +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 @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set; @@ -98,15 +108,10 @@ import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.MethodMetadata; import org.springframework.util.CollectionUtils; -@@ -146,4 +146,4 @@ - annotatedMethods.addAll(list); - return annotatedMethods; - } --} -\ No newline at end of file -+} ---- 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 +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 @@ -19,11 +19,11 @@ import java.util.LinkedHashMap; import java.util.Map; @@ -131,8 +136,10 @@ -} \ No newline at end of file +} ---- 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 +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 @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.InputStream; @@ -158,8 +165,10 @@ -} \ No newline at end of file +} ---- 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 +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 @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.Map; @@ -169,9 +178,11 @@ import net.sf.cglib.core.Signature; import net.sf.cglib.proxy.InterfaceMaker; import org.apache.commons.logging.Log; ---- a/projects/org.springframework.aop/ivy.xml -+++ b/projects/org.springframework.aop/ivy.xml -@@ -36,7 +36,7 @@ +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 +@@ -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"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/> @@ -180,9 +191,11 @@ </dependencies> </ivy-module> ---- a/projects/org.springframework.beans/ivy.xml -+++ b/projects/org.springframework.beans/ivy.xml -@@ -30,7 +30,7 @@ +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 +@@ -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="${org.junit.version}" conf="test->runtime"/> <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/> @@ -191,9 +204,11 @@ </dependencies> </ivy-module> ---- a/projects/org.springframework.context/ivy.xml -+++ b/projects/org.springframework.context/ivy.xml -@@ -49,7 +49,7 @@ +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 +@@ -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"/> <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, jruby->compile"/> @@ -202,9 +217,11 @@ <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"/> ---- a/projects/org.springframework.core/ivy.xml -+++ b/projects/org.springframework.core/ivy.xml -@@ -26,7 +26,7 @@ +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 +@@ -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"/> <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/> @@ -213,9 +230,11 @@ <!-- 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="${org.junit.version}" conf="test->runtime"/> ---- a/projects/org.springframework.integration-tests/ivy.xml -+++ b/projects/org.springframework.integration-tests/ivy.xml -@@ -73,7 +73,7 @@ +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 +@@ -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"/> <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/> @@ -224,9 +243,11 @@ <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"/> ---- a/projects/org.springframework.spring-library/ivy.xml -+++ b/projects/org.springframework.spring-library/ivy.xml -@@ -19,7 +19,7 @@ +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 +@@ -21,7 +21,7 @@ <dependencies> <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/> @@ -235,9 +256,11 @@ <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"/> ---- a/projects/org.springframework.web.portlet/ivy.xml -+++ b/projects/org.springframework.web.portlet/ivy.xml -@@ -33,7 +33,7 @@ +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 +@@ -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"/> <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/> @@ -246,9 +269,11 @@ <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="${org.junit.version}" conf="test->runtime"/> </dependencies> ---- a/projects/org.springframework.web.servlet/ivy.xml -+++ b/projects/org.springframework.web.servlet/ivy.xml -@@ -83,8 +83,8 @@ +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 @@ <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"/> Modified: trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff =================================================================== --- trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff 2010-11-04 21:50:59 UTC (rev 13062) +++ trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff 2010-11-06 18:27:05 UTC (rev 13063) @@ -1,7 +1,7 @@ Description: Don't use Ivy for dependencies resolution as not enough debian packages provide Maven/Ivy metadata. Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-06-20 +Last-Update: 2010-11-05 Forwarded: not-needed --- a/projects/org.springframework.aop/ivy.xml +++ b/projects/org.springframework.aop/ivy.xml @@ -139,16 +139,18 @@ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/> --- a/projects/org.springframework.instrument.tomcat/ivy.xml +++ b/projects/org.springframework.instrument.tomcat/ivy.xml -@@ -19,7 +19,9 @@ +@@ -20,8 +20,10 @@ + <artifact name="notice" type="notice" ext="txt"/> </publications> ++<!-- <dependencies> -+<!-- <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="6.0.16" conf="provided->compile"/> + </dependencies> +--> - </dependencies> </ivy-module> + --- a/projects/org.springframework.core/ivy.xml +++ b/projects/org.springframework.core/ivy.xml @@ -23,9 +23,11 @@ @@ -165,7 +167,7 @@ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/> --- a/projects/org.springframework.expression/ivy.xml +++ b/projects/org.springframework.expression/ivy.xml -@@ -21,7 +21,9 @@ +@@ -23,7 +23,9 @@ <dependencies> <!-- compile dependencies --> @@ -177,7 +179,7 @@ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/> --- a/projects/org.springframework.jdbc/ivy.xml +++ b/projects/org.springframework.jdbc/ivy.xml -@@ -24,16 +24,20 @@ +@@ -26,16 +26,20 @@ </publications> <dependencies> @@ -200,7 +202,7 @@ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/> --- a/projects/org.springframework.transaction/ivy.xml +++ b/projects/org.springframework.transaction/ivy.xml -@@ -23,12 +23,14 @@ +@@ -25,12 +25,14 @@ </publications> <dependencies> @@ -217,7 +219,7 @@ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/> --- a/projects/org.springframework.orm/ivy.xml +++ b/projects/org.springframework.orm/ivy.xml -@@ -31,6 +31,7 @@ +@@ -33,6 +33,7 @@ </publications> <dependencies> @@ -225,7 +227,7 @@ <dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional, toplink->compile"/> <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="optional, aop->compile"/> <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/> -@@ -45,6 +46,7 @@ +@@ -47,6 +48,7 @@ <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/> <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided, web->compile"/> <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/> @@ -235,7 +237,7 @@ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/> --- a/projects/org.springframework.oxm/ivy.xml +++ b/projects/org.springframework.oxm/ivy.xml -@@ -26,6 +26,7 @@ +@@ -28,6 +28,7 @@ </publications> <dependencies> @@ -243,7 +245,7 @@ <dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.1" conf="optional, xstream->compile"/> <dependency org="javax.xml.bind" name="com.springsource.javax.xml.bind" rev="2.1.7" -@@ -34,13 +35,16 @@ +@@ -36,13 +37,16 @@ conf="optional, jibx->compile"/> <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/> @@ -262,7 +264,7 @@ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" --- a/projects/org.springframework.jms/ivy.xml +++ b/projects/org.springframework.jms/ivy.xml -@@ -21,6 +21,7 @@ +@@ -23,6 +23,7 @@ </publications> <dependencies> @@ -270,17 +272,17 @@ <dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->compile"/> <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="provided, jca->compile"/> -@@ -31,6 +32,7 @@ - conf="compile, commons-logging->compile"/> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" +@@ -35,6 +36,7 @@ conf="optional, commons-pool->compile"/> -+--> <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="${org.junit.version}" conf="test->compile"/> ++--> <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" --- a/projects/org.springframework.web/ivy.xml +++ b/projects/org.springframework.web/ivy.xml -@@ -33,6 +33,7 @@ +@@ -35,6 +35,7 @@ </publications> <dependencies> @@ -288,7 +290,7 @@ <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="optional, hessian, burlap->compile"/> <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0" -@@ -64,6 +65,7 @@ +@@ -66,6 +67,7 @@ conf="optional, jackson->compile"/> <dependency org="org.jdom" name="com.springsource.org.jdom" rev="1.1.0" conf="optional, feed->compile"/> @@ -298,7 +300,7 @@ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" --- a/projects/org.springframework.context.support/ivy.xml +++ b/projects/org.springframework.context.support/ivy.xml -@@ -29,6 +29,7 @@ +@@ -31,6 +31,7 @@ </publications> <dependencies> @@ -306,7 +308,7 @@ <dependency org="com.bea.commonj" name="com.springsource.commonj" rev="1.1.0" conf="optional, commonj->compile"/> <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="optional, quartz->compile"/> <dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/> -@@ -39,6 +40,7 @@ +@@ -41,6 +42,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.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional, velocity->compile"/> <dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15" conf="optional, freemarker->compile"/> @@ -316,7 +318,7 @@ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/> --- a/projects/org.springframework.aspects/ivy.xml +++ b/projects/org.springframework.aspects/ivy.xml -@@ -23,8 +23,10 @@ +@@ -25,17 +25,21 @@ </publications> <dependencies> @@ -327,19 +329,20 @@ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/> <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/> <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/> -@@ -32,7 +34,9 @@ + <dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/> <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/> <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/> ++<!-- + <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/> -+<!-- - <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided->compile"/> + <dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/> +--> - <dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/> </dependencies> + </ivy-module> --- a/projects/org.springframework.test/ivy.xml +++ b/projects/org.springframework.test/ivy.xml -@@ -20,6 +20,7 @@ +@@ -22,6 +22,7 @@ </publications> <dependencies> @@ -347,7 +350,7 @@ <dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/> <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/> <dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/> -@@ -36,6 +37,7 @@ +@@ -38,6 +39,7 @@ <dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/> <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/> @@ -355,7 +358,7 @@ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/> <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/> <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/> -@@ -45,7 +47,9 @@ +@@ -47,7 +49,9 @@ <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional->compile"/> <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="optional->compile"/> <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="optional->compile"/> @@ -367,7 +370,7 @@ </ivy-module> --- a/projects/org.springframework.web.struts/ivy.xml +++ b/projects/org.springframework.web.struts/ivy.xml -@@ -21,12 +21,14 @@ +@@ -23,12 +23,14 @@ </publications> <dependencies> Modified: trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff =================================================================== --- trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff 2010-11-04 21:50:59 UTC (rev 13062) +++ trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff 2010-11-06 18:27:05 UTC (rev 13063) @@ -3,8 +3,10 @@ Author: Damien Raude-Morvan <[email protected]> Forwarded: not-needed Last-Update: 2010-08-24 ---- a/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java -+++ b/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java +Index: libspring-java/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java +=================================================================== +--- libspring-java.orig/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java 2010-10-20 16:29:40.000000000 -0430 ++++ libspring-java/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java 2010-11-05 16:06:32.000000000 -0430 @@ -30,7 +30,7 @@ import javax.validation.ValidatorFactory; import javax.validation.spi.ValidationProvider; @@ -37,8 +39,10 @@ + }*/ } ---- a/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java -+++ /dev/null +Index: libspring-java/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java +=================================================================== +--- libspring-java.orig/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java 2010-10-20 16:29:40.000000000 -0430 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
