[pkg-java] r13833 - in branches/libspring-java/3.1/debian: . patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Sat Jul 2 14:03:52 UTC 2011
Author: nomadium-guest
Date: 2011-07-02 14:03:52 +0000 (Sat, 02 Jul 2011)
New Revision: 13833
Added:
branches/libspring-java/3.1/debian/patches/0010_httpclient_41.diff
Modified:
branches/libspring-java/3.1/debian/build-classpath
branches/libspring-java/3.1/debian/changelog
branches/libspring-java/3.1/debian/control
branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff
branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff
branches/libspring-java/3.1/debian/patches/series
branches/libspring-java/3.1/debian/watch
Log:
First attempt to build a package for 3.1, it still FTBFS
Modified: branches/libspring-java/3.1/debian/build-classpath
===================================================================
--- branches/libspring-java/3.1/debian/build-classpath 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/build-classpath 2011-07-02 14:03:52 UTC (rev 13833)
@@ -21,6 +21,7 @@
/usr/share/java/cglib.jar
/usr/share/java/commons-beanutils.jar
/usr/share/java/commons-collections3.jar
+/usr/share/java/tomcat-servlet-api-3.0.jar
/usr/share/java/commons-fileupload.jar
/usr/share/java/commons-httpclient.jar
/usr/share/java/commons-logging.jar
@@ -49,6 +50,8 @@
/usr/share/java/hibernate-core.jar
/usr/share/java/hibernate-entitymanager.jar
#/usr/share/java/hibernate-validator.jar
+/usr/share/java/httpclient.jar
+/usr/share/java/httpcore.jar
/usr/share/java/ibatis.jar
/usr/share/java/itext.jar
/usr/share/java/jackson-core.jar
Modified: branches/libspring-java/3.1/debian/changelog
===================================================================
--- branches/libspring-java/3.1/debian/changelog 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/changelog 2011-07-02 14:03:52 UTC (rev 13833)
@@ -1,3 +1,12 @@
+libspring-java (3.1.0~M2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+ * Bump Standards-Version to 3.9.2. No changes were required.
+ * Add dependencies on libhttpcore-java.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Tue, 28 Jun 2011 19:58:45 -0430
+
libspring-java (3.0.5.RELEASE-3) unstable; urgency=low
* Upgrade d/maven.rules and d/maven.ignoreRules to include
Modified: branches/libspring-java/3.1/debian/control
===================================================================
--- branches/libspring-java/3.1/debian/control 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/control 2011-07-02 14:03:52 UTC (rev 13833)
@@ -18,8 +18,8 @@
libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java,
libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, libstruts1.2-java,
libtiles-java, libtomcat6-java, libvelocity-tools-java, libxmlbeans-java, libxstream-java,
- testng, velocity
-Standards-Version: 3.9.1
+ testng, velocity, libhttpcore-java, libhttpclient-java (>= 4.1.1), libservlet3.0-java
+Standards-Version: 3.9.2
Homepage: http://springframework.org/about
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-java/
@@ -91,7 +91,7 @@
Package: libspring-web-java
Architecture: all
Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version}), libspring-core-java (= ${source:Version})
-Recommends: libspring-aop-java (= ${source:Version}), libspring-oxm-java (= ${source:Version})
+Recommends: libspring-aop-java (= ${source:Version}), libspring-oxm-java (= ${source:Version}), libhttpcore-java, libhttpclient-java, libservlet3.0-java
Suggests: libhessian-java, libcommons-httpclient-java, libaxis-java, libcommons-fileupload-java,
libjackson-json-java
Description: modular Java/J2EE application framework - Web
Modified: branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff 2011-07-02 14:03:52 UTC (rev 13833)
@@ -3,25 +3,23 @@
- small fix to API usage
- disable build of org.springframework.asm module
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-06-20
+Last-Update: 2011-06-28
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
-@@ -25,7 +25,6 @@
-
- <path id="bundles">
- <pathelement location="../org.springframework.spring-parent"/>
-- <pathelement location="../org.springframework.asm"/>
- <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
-@@ -28,12 +28,12 @@
+
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/ivy.xml
++++ libspring-java-3.1.0~M2/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"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
+ <!-- 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"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+@@ -28,12 +28,12 @@ import java.util.concurrent.ConcurrentHa
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,7 +38,7 @@
import org.springframework.util.ClassUtils;
/**
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ public class LocalVariableTableParameter
try {
ClassReader classReader = new ClassReader(is);
Map<Member, String[]> map = new ConcurrentHashMap<Member, String[]>();
@@ -49,53 +47,9 @@
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
-@@ -16,13 +16,13 @@
-
- package org.springframework.core.type.classreading;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.Attribute;
--import org.springframework.asm.ClassVisitor;
--import org.springframework.asm.FieldVisitor;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Attribute;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.commons.EmptyVisitor;
- 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
-@@ -25,9 +25,9 @@
- import java.util.Map;
- import java.util.Set;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- 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
-@@ -23,9 +23,9 @@
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
+@@ -23,9 +23,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -108,39 +62,9 @@
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
-@@ -19,11 +19,11 @@
- import java.util.LinkedHashMap;
- import java.util.Map;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.MethodAdapter;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.MethodAdapter;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.type.MethodMetadata;
- import org.springframework.util.MultiValueMap;
-
-@@ -95,4 +95,4 @@
- public String getDeclaringClassName() {
- return this.declaringClassName;
- }
--}
-\ 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
-@@ -19,7 +19,7 @@
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
+@@ -19,7 +19,7 @@ package org.springframework.core.type.cl
import java.io.IOException;
import java.io.InputStream;
@@ -149,7 +73,7 @@
import org.springframework.core.io.Resource;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.ClassMetadata;
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ final class SimpleMetadataReader impleme
}
AnnotationMetadataReadingVisitor visitor = new AnnotationMetadataReadingVisitor(classLoader);
@@ -158,95 +82,111 @@
this.annotationMetadata = visitor;
// (since AnnotationMetadataReader extends ClassMetadataReadingVisitor)
-@@ -70,4 +70,4 @@
+@@ -70,4 +70,4 @@ final class SimpleMetadataReader impleme
public AnnotationMetadata getAnnotationMetadata() {
return this.annotationMetadata;
}
-}
\ 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
-@@ -20,7 +20,7 @@
- import java.util.Iterator;
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
+@@ -19,11 +19,11 @@ package org.springframework.core.type.cl
+ import java.util.LinkedHashMap;
import java.util.Map;
--import net.sf.cglib.asm.Type;
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.MethodAdapter;
+-import org.springframework.asm.Opcodes;
+-import org.springframework.asm.Type;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.MethodAdapter;
++import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
- 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
-@@ -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"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- </dependencies>
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.core.type.MethodMetadata;
+ import org.springframework.util.MultiValueMap;
- </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
-@@ -32,7 +32,7 @@
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+@@ -95,4 +95,4 @@ final class MethodMetadataReadingVisitor
+ public String getDeclaringClassName() {
+ return this.declaringClassName;
+ }
+-}
+\ No newline at end of file
++}
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
+@@ -19,13 +19,13 @@ package org.springframework.core.type.cl
+ import java.util.LinkedHashSet;
+ import java.util.Set;
+
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.Attribute;
+-import org.springframework.asm.ClassVisitor;
+-import org.springframework.asm.FieldVisitor;
+-import org.springframework.asm.MethodVisitor;
+-import org.springframework.asm.Opcodes;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.Attribute;
++import org.objectweb.asm.ClassVisitor;
++import org.objectweb.asm.FieldVisitor;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.core.type.ClassMetadata;
+ import org.springframework.util.ClassUtils;
+
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
+@@ -25,9 +25,9 @@ import java.util.LinkedHashSet;
+ import java.util.Map;
+ import java.util.Set;
+
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.Type;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.core.annotation.AnnotationUtils;
+ import org.springframework.util.ObjectUtils;
+ import org.springframework.util.ReflectionUtils;
+--- libspring-java-3.1.0~M2.orig/projects/build-spring-framework/build.xml
++++ libspring-java-3.1.0~M2/projects/build-spring-framework/build.xml
+@@ -25,7 +25,6 @@
+
+ <path id="bundles">
+ <pathelement location="../org.springframework.spring-parent"/>
+- <pathelement location="../org.springframework.asm"/>
+ <path refid="unit.test.bundles" />
+ <pathelement location="../org.springframework.integration-tests"/>
+ <pathelement location="../org.springframework.spring-library"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.beans/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.beans/ivy.xml
+@@ -33,7 +33,7 @@
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ <dependency org="org.hamcrest" name="com.springsource.org.hamcrest" rev="1.1.0" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
</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
-@@ -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"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->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" conf="compile->compile"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.portlet/ivy.xml
++++ libspring-java-3.1.0~M2/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"/>
-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"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
- <!-- 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"/>
-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"/>
+ <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"/>
- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <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
+ <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>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.spring-library/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.spring-library/ivy.xml
@@ -21,7 +21,7 @@
<dependencies>
@@ -256,23 +196,41 @@
<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
-@@ -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"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.integration-tests/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.integration-tests/ivy.xml
+@@ -77,7 +77,7 @@
+ <dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="test->runtime"/>
+ <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" 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"/>
- </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
+ <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"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.context/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.context/ivy.xml
+@@ -53,7 +53,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"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->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" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
+@@ -20,7 +20,7 @@ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+
+-import net.sf.cglib.asm.Type;
++import org.objectweb.asm.Type;
+ import net.sf.cglib.core.Signature;
+ import net.sf.cglib.proxy.InterfaceMaker;
+ import org.apache.commons.logging.Log;
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.servlet/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.web.servlet/ivy.xml
@@ -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"
@@ -284,3 +242,14 @@
<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0"
conf="test->compile"/>
<dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.aop/ivy.xml
++++ libspring-java-3.1.0~M2/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"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ </dependencies>
+
+ </ivy-module>
Modified: branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff 2011-07-02 14:03:52 UTC (rev 13833)
@@ -1,100 +1,135 @@
Description: Don't use Ivy for dependencies resolution
as not enough debian packages provide Maven/Ivy metadata.
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-11-05
+Last-Update: 2011-06-28
Forwarded: not-needed
---- a/projects/org.springframework.aop/ivy.xml
-+++ b/projects/org.springframework.aop/ivy.xml
-@@ -24,12 +24,14 @@
+
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.core/ivy.xml
+@@ -25,9 +25,11 @@
</publications>
<dependencies>
+<!--
- <dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
- <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
<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.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->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"/>
+-->
- <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"/>
+ <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
<!-- test dependencies -->
---- a/projects/org.springframework.beans/ivy.xml
-+++ b/projects/org.springframework.beans/ivy.xml
-@@ -21,10 +21,12 @@
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.web/ivy.xml
+@@ -35,6 +35,7 @@
</publications>
<dependencies>
+<!--
- <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="provided->compile"/>
- <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+ <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"
+@@ -68,6 +69,7 @@
+ conf="optional, jackson->compile"/>
+ <dependency org="org.jdom" name="com.springsource.org.jdom" rev="1.1.0"
+ conf="optional, feed->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"
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.aspects/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.aspects/ivy.xml
+@@ -27,17 +27,21 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
++-->
+ <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"/>
+ <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="context->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="optional, cache->compile"/>
++<!--
+ <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.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
++-->
+ </dependencies>
+
+ </ivy-module>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.jdbc/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.jdbc/ivy.xml
+@@ -26,16 +26,20 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+-->
+ <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="optional, jndi->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
++<!--
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="optional->compile"/>
+ <dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
+ <dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
++-->
<!-- test dependencies -->
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
---- a/projects/org.springframework.context/ivy.xml
-+++ b/projects/org.springframework.context/ivy.xml
-@@ -32,6 +32,7 @@
+ <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"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.transaction/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.transaction/ivy.xml
+@@ -25,12 +25,14 @@
</publications>
<dependencies>
+<!--
- <dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional, backport-util-concurrent->compile"/>
- <dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="provided, ejb->compile"/>
+ <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="provided, websphere->compile"/>
<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
-@@ -49,6 +50,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"/>
+ <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="provided, jca->compile"/>
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
+ <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->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" conf="compile->compile"/>
-@@ -56,7 +58,9 @@
- <dependency org="org.springframework" name="org.springframework.expression" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.instrument" rev="latest.integration" conf="optional, instrumentation->compile"/>
- <!-- test dependencies -->
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.expression/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.expression/ivy.xml
+@@ -23,7 +23,9 @@
+
+ <dependencies>
+ <!-- compile dependencies -->
+<!--
- <dependency org="javax.inject" name="com.springsource.org.atinject.tck" rev="1.0.0" conf="provided->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->runtime" />
+-->
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
- <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="test->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
---- a/projects/org.springframework.integration-tests/ivy.xml
-+++ b/projects/org.springframework.integration-tests/ivy.xml
-@@ -19,6 +19,7 @@
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
+ <!-- test dependencies -->
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.beans/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.beans/ivy.xml
+@@ -23,10 +23,12 @@
</publications>
<dependencies>
+<!--
- <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
- <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
- <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
-@@ -73,6 +74,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"/>
+ <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="provided->compile"/>
+ <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <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"/>
---- a/projects/org.springframework.spring-library/ivy.xml
-+++ b/projects/org.springframework.spring-library/ivy.xml
-@@ -32,7 +32,7 @@
- <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"/>
- <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
-+ <!--<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.web.portlet/ivy.xml
-+++ b/projects/org.springframework.web.portlet/ivy.xml
-@@ -21,6 +21,7 @@
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <!-- test dependencies -->
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.portlet/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.web.portlet/ivy.xml
+@@ -23,6 +23,7 @@
</publications>
<dependencies>
@@ -102,7 +137,7 @@
<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="compile->compile"/>
-@@ -28,6 +29,7 @@
+@@ -30,6 +31,7 @@
<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="test->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="optional, commons-fileupload->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
@@ -110,115 +145,137 @@
<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.core" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.web.servlet/ivy.xml
-+++ b/projects/org.springframework.web.servlet/ivy.xml
-@@ -31,6 +31,7 @@
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.test/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.test/ivy.xml
+@@ -22,6 +22,7 @@
</publications>
<dependencies>
+<!--
- <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
- conf="optional, feed->compile"/>
- <dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8"
-@@ -64,6 +65,7 @@
- conf="optional, velocity->compile"/>
- <dependency org="org.codehaus.jackson" name="com.springsource.org.codehaus.jackson.mapper" rev="1.4.2"
- conf="optional, jackson->compile"/>
+ <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"/>
+@@ -37,6 +38,7 @@
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->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"/>
+-->
- <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"
-@@ -98,7 +100,7 @@
- conf="test->compile"/>
- <dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
- conf="test->compile"/>
-- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
-+ <!--<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>-->
- <dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
- <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
-@@ -20,8 +20,10 @@
- <artifact name="notice" type="notice" ext="txt"/>
- </publications>
-
+ <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"/>
+@@ -46,7 +48,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"/>
+<!--
- <dependencies>
- <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="6.0.16" conf="provided->compile"/>
+ <dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="optional->compile"/>
++-->
</dependencies>
-+-->
</ivy-module>
-
---- a/projects/org.springframework.core/ivy.xml
-+++ b/projects/org.springframework.core/ivy.xml
-@@ -23,9 +23,11 @@
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.spring-library/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.spring-library/ivy.xml
+@@ -34,7 +34,7 @@
+ <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"/>
+ <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="compile->compile"/>
+- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
++ <!--<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>-->
+ </dependencies>
+
+ </ivy-module>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.integration-tests/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.integration-tests/ivy.xml
+@@ -21,6 +21,7 @@
</publications>
<dependencies>
+<!--
- <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"/>
+ <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
+ <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
+ <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
+@@ -77,6 +78,7 @@
+ <dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="test->runtime"/>
+ <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
- <!-- test dependencies -->
- <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
-@@ -23,7 +23,9 @@
+ <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <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"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.context/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.context/ivy.xml
+@@ -35,6 +35,7 @@
+ </publications>
<dependencies>
- <!-- compile dependencies -->
+<!--
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->runtime" />
+ <dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional, backport-util-concurrent->compile"/>
+ <dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="provided, ejb->compile"/>
+ <dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
+@@ -53,6 +54,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"/>
+-->
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
+ <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->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" conf="compile->compile"/>
+@@ -60,7 +62,9 @@
+ <dependency org="org.springframework" name="org.springframework.expression" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.instrument" rev="latest.integration" conf="optional, instrumentation->compile"/>
<!-- test dependencies -->
- <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
-@@ -26,16 +26,20 @@
++<!--
+ <dependency org="javax.inject" name="com.springsource.org.atinject.tck" rev="1.0.0" conf="provided->compile"/>
++-->
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
+ <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="test->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.oxm/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.oxm/ivy.xml
+@@ -28,6 +28,7 @@
</publications>
<dependencies>
+<!--
- <dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <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"
+@@ -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"/>
+-->
- <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="optional, jndi->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
+ <!--Xerces dependency should be removed when BRITS-259 is fixed-->
+<!--
- <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="optional->compile"/>
- <dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
- <dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
+ <dependency org="org.apache.xerces" name="com.springsource.org.apache.xerces" rev="2.8.1"
+ conf="optional, castor->compile"/>
+ <dependency org="org.apache.xmlbeans" name="com.springsource.org.apache.xmlbeans" rev="2.4.0"
+ conf="optional, xmlbeans->compile"/>
+ <dependency org="org.codehaus.castor" name="com.springsource.org.castor" rev="1.2.0"
+ conf="optional, castor->compile"/>
+-->
- <!-- test dependencies -->
- <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"/>
---- a/projects/org.springframework.transaction/ivy.xml
-+++ b/projects/org.springframework.transaction/ivy.xml
-@@ -25,12 +25,14 @@
+ <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"
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.struts/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.web.struts/ivy.xml
+@@ -23,12 +23,14 @@
</publications>
<dependencies>
+<!--
- <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="provided, websphere->compile"/>
- <dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
- <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="provided, jca->compile"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
+ <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.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
+ conf="compile->compile"/>
+ <dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->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" conf="compile->compile"/>
- <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
+ <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"
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.orm/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.orm/ivy.xml
@@ -33,6 +33,7 @@
</publications>
@@ -235,35 +292,21 @@
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="optional, aop->compile"/>
<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="optional, jndi->compile"/>
---- a/projects/org.springframework.oxm/ivy.xml
-+++ b/projects/org.springframework.oxm/ivy.xml
-@@ -28,6 +28,7 @@
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.instrument.tomcat/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.instrument.tomcat/ivy.xml
+@@ -20,8 +20,10 @@
+ <artifact name="notice" type="notice" ext="txt"/>
</publications>
++<!--
<dependencies>
-+<!--
- <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"
-@@ -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"/>
+ <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="6.0.16" conf="provided->compile"/>
+ </dependencies>
+-->
- <!--Xerces dependency should be removed when BRITS-259 is fixed-->
-+<!--
- <dependency org="org.apache.xerces" name="com.springsource.org.apache.xerces" rev="2.8.1"
- conf="optional, castor->compile"/>
- <dependency org="org.apache.xmlbeans" name="com.springsource.org.apache.xmlbeans" rev="2.4.0"
- conf="optional, xmlbeans->compile"/>
- <dependency org="org.codehaus.castor" name="com.springsource.org.castor" rev="1.2.0"
- conf="optional, castor->compile"/>
-+-->
- <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"
---- a/projects/org.springframework.jms/ivy.xml
-+++ b/projects/org.springframework.jms/ivy.xml
+
+ </ivy-module>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.jms/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.jms/ivy.xml
@@ -23,6 +23,7 @@
</publications>
@@ -280,35 +323,61 @@
<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
-@@ -35,6 +35,7 @@
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.servlet/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.web.servlet/ivy.xml
+@@ -33,6 +33,7 @@
</publications>
<dependencies>
+<!--
- <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"
+ <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
+ conf="optional, feed->compile"/>
+ <dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8"
@@ -66,6 +67,7 @@
+ conf="optional, velocity->compile"/>
+ <dependency org="org.codehaus.jackson" name="com.springsource.org.codehaus.jackson.mapper" rev="1.4.2"
conf="optional, jackson->compile"/>
- <dependency org="org.jdom" name="com.springsource.org.jdom" rev="1.1.0"
- conf="optional, feed->compile"/>
+-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration"
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
conf="compile->compile"/>
- <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
-@@ -31,6 +31,7 @@
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
+@@ -100,7 +102,7 @@
+ conf="test->compile"/>
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
+ conf="test->compile"/>
+- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
++ <!--<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>-->
+ <dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.aop/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.aop/ivy.xml
+@@ -26,12 +26,14 @@
</publications>
<dependencies>
+<!--
+ <dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
+ <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+ <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+ <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.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->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"/>
+ <!-- test dependencies -->
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.context.support/ivy.xml
++++ libspring-java-3.1.0~M2/projects/org.springframework.context.support/ivy.xml
+@@ -30,6 +30,7 @@
+ </publications>
+
+ <dependencies>
++<!--
<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"/>
-@@ -41,6 +42,7 @@
+@@ -39,6 +40,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,72 +385,3 @@
<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.core" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.aspects/ivy.xml
-+++ b/projects/org.springframework.aspects/ivy.xml
-@@ -25,17 +25,21 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-+-->
- <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"/>
- <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.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
-+-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.test/ivy.xml
-+++ b/projects/org.springframework.test/ivy.xml
-@@ -22,6 +22,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <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"/>
-@@ -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"/>
-+-->
- <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"/>
-@@ -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"/>
-+<!--
- <dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="optional->compile"/>
-+-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.web.struts/ivy.xml
-+++ b/projects/org.springframework.web.struts/ivy.xml
-@@ -23,12 +23,14 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
- <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.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
- conf="compile->compile"/>
- <dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
-+-->
- <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"
Added: branches/libspring-java/3.1/debian/patches/0010_httpclient_41.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0010_httpclient_41.diff (rev 0)
+++ branches/libspring-java/3.1/debian/patches/0010_httpclient_41.diff 2011-07-02 14:03:52 UTC (rev 13833)
@@ -0,0 +1,26 @@
+Description: Compatibility with HttpClient 4.1
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2011-07-01
+
+--- libspring-java-3.1.0~M2.orig/projects/org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
++++ libspring-java-3.1.0~M2/projects/org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
+@@ -30,6 +30,7 @@ import org.apache.http.client.methods.Ht
+ import org.apache.http.client.methods.HttpUriRequest;
+ import org.apache.http.conn.scheme.PlainSocketFactory;
+ import org.apache.http.conn.scheme.Scheme;
++import org.apache.http.conn.scheme.SchemeSocketFactory;
+ import org.apache.http.conn.scheme.SchemeRegistry;
+ import org.apache.http.conn.ssl.SSLSocketFactory;
+ import org.apache.http.impl.client.DefaultHttpClient;
+@@ -67,8 +68,8 @@ public class HttpComponentsClientHttpReq
+ */
+ public HttpComponentsClientHttpRequestFactory() {
+ SchemeRegistry schemeRegistry = new SchemeRegistry();
+- schemeRegistry.register(new Scheme("http", 80, PlainSocketFactory.getSocketFactory()));
+- schemeRegistry.register(new Scheme("https", 443, SSLSocketFactory.getSocketFactory()));
++ schemeRegistry.register(new Scheme("http", 80, (SchemeSocketFactory)PlainSocketFactory.getSocketFactory()));
++ schemeRegistry.register(new Scheme("https", 443, (SchemeSocketFactory)SSLSocketFactory.getSocketFactory()));
+
+ ThreadSafeClientConnManager connectionManager = new ThreadSafeClientConnManager(schemeRegistry);
+ connectionManager.setMaxTotal(DEFAULT_MAX_TOTAL_CONNECTIONS);
Modified: branches/libspring-java/3.1/debian/patches/series
===================================================================
--- branches/libspring-java/3.1/debian/patches/series 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/patches/series 2011-07-02 14:03:52 UTC (rev 13833)
@@ -7,3 +7,4 @@
0007_no_jruby.diff
0008_jpa_20_api.diff
0009_hibernate_validator_41.diff
+0010_httpclient_41.diff
Modified: branches/libspring-java/3.1/debian/watch
===================================================================
--- branches/libspring-java/3.1/debian/watch 2011-07-02 13:59:30 UTC (rev 13832)
+++ branches/libspring-java/3.1/debian/watch 2011-07-02 14:03:52 UTC (rev 13833)
@@ -1,3 +1,4 @@
version=3
+opts="uversionmangle=s/\.M/~M/" \
https://src.springframework.org/svn/spring-framework/tags/ \
spring-framework-(.*)/
More information about the pkg-java-commits
mailing list