[pkg-java] r12739 - in trunk/libspring-2.5-java/debian: . excludesfiles patches poms

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Jul 7 23:38:12 UTC 2010 

Author: drazzib
Date: 2010-07-07 23:38:12 +0000 (Wed, 07 Jul 2010)
New Revision: 12739

Added:
   trunk/libspring-2.5-java/debian/patches/16_commonj.diff
Modified:
   trunk/libspring-2.5-java/debian/README.Debian
   trunk/libspring-2.5-java/debian/changelog
   trunk/libspring-2.5-java/debian/classpath-debian
   trunk/libspring-2.5-java/debian/control
   trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
   trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes
   trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff
   trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff
   trunk/libspring-2.5-java/debian/patches/14_portlet_api.diff
   trunk/libspring-2.5-java/debian/patches/series
   trunk/libspring-2.5-java/debian/poms/spring-aop-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-beans-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-context-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-context-support-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-core-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-jdbc-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-jms-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-orm-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-test-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-tx-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-web-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-webmvc-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-webmvc-portlet-2.5.xml
   trunk/libspring-2.5-java/debian/poms/spring-webmvc-struts-2.5.xml
   trunk/libspring-2.5-java/debian/rules
Log:
* Enable support for JavaServer Faces API. (Closes: #587835).
* Bump Standards-Version to 3.9.0. No changes were needed.
* New upstream security release (hence urgency=high)
  - [SECURITY] Include fix for CVE-2010-1622:
    Spring Framework execution of arbitrary code
* Enable support for Hessian API.
  - Add B-D on libhessian-java
* Enable support for CommonJ API.
  - Add B-D on libgeronimo-commonj-spec-java
* Enable support for JPA 1.0 API.
  - Add B-D on libhibernate-entitymanager-java, libeclipselink-java
    and libopenjpa-java

Modified: trunk/libspring-2.5-java/debian/README.Debian
===================================================================
--- trunk/libspring-2.5-java/debian/README.Debian	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/README.Debian	2010-07-07 23:38:12 UTC (rev 12739)
@@ -18,24 +18,11 @@
   [non-free] Debian JRuby package is in non-free archive
     org/springframework/scripting/jruby/**
 
-* spring-context-support
-  [non-free] BEA CommonJ is non-free
-    org/springframework/scheduling/commonj/**
-
 * spring-orm
   [non-free] Oracle TopLink 9.0.4 is non-free
     org/springframework/orm/toplink/SessionBrokerSessionFactory.java
     org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
-  [non-free] JPA API is not in Debian yet
-    org/springframework/orm/jpa/vendor/**
 
-* spring-web
-  [non-free] JSF RI is not DFSG-free
-    org/springframework/web/jsf/**
-    org/springframework/web/context/request/Faces*
-  [not-in-debian] no Caucho package in Debbian
-    org/springframework/remoting/caucho/**
-
 * spring-tx
   [non-free] IBM Websphere is non-free
     org/springframework/transaction/jta/WebSphereUowTransactionManager.java

Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/changelog	2010-07-07 23:38:12 UTC (rev 12739)
@@ -1,3 +1,23 @@
+libspring-2.5-java (2.5.6.SEC02-1) unstable; urgency=high
+
+  [ Miguel Landaeta ]
+  * Enable support for JavaServer Faces API. (Closes: #587835).
+  * Bump Standards-Version to 3.9.0. No changes were needed.
+
+  [ Damien Raude-Morvan ]
+  * New upstream security release (hence urgency=high)
+    - [SECURITY] Include fix for CVE-2010-1622:
+      Spring Framework execution of arbitrary code
+  * Enable support for Hessian API.
+    - Add B-D on libhessian-java
+  * Enable support for CommonJ API.
+    - Add B-D on libgeronimo-commonj-spec-java
+  * Enable support for JPA 1.0 API.
+    - Add B-D on libhibernate-entitymanager-java, libeclipselink-java
+      and libopenjpa-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 08 Jul 2010 01:28:57 +0200
+
 libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
 
   [ Onkar Shinde ]

Modified: trunk/libspring-2.5-java/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/classpath-debian	2010-07-07 23:38:12 UTC (rev 12739)
@@ -48,6 +48,13 @@
 usr/share/java/glassfish-appserv-jstl.jar
 usr/share/java/testng.jar
 usr/share/java/portlet-api.jar
+usr/share/java/jsf-api.jar
+usr/share/java/hessian.jar
+usr/share/java/geronimo-commonj-spec.jar
+usr/share/java/glassfish-jpa.jar
+usr/share/java/eclipselink.jar
+usr/share/java/openjpa.jar
+usr/share/java/hibernate-entitymanager.jar
 
 # buildtiger
 usr/share/tomcat6/lib/catalina.jar

Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/control	2010-07-07 23:38:12 UTC (rev 12739)
@@ -13,8 +13,9 @@
  libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
  libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java,
  glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, aspectj (>= 1.6.4), libjasperreports-java,
- maven-repo-helper, libportlet-api-2.0-spec-java
-Standards-Version: 3.8.4
+ maven-repo-helper, libportlet-api-2.0-spec-java, libjsf-api-java, libhessian-java, libgeronimo-commonj-spec-java,
+ libeclipselink-java, libopenjpa-java, libhibernate-entitymanager-java
+Standards-Version: 3.9.0
 Homepage: http://springframework.org/about
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-2.5-java/
@@ -68,7 +69,8 @@
 Package: libspring-context-support-2.5-java
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
-Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity
+Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity,
+ libgeronimo-commonj-spec-java
 Description: modular Java/J2EE application framework - Context Support
  Spring is a layered Java/J2EE application framework offering a lot of freedom
  to Java developers yet providing well documented and easy-to-use solutions for
@@ -80,7 +82,7 @@
 Package: libspring-web-2.5-java
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
-Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java
+Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java, libjsf-api-java, libhessian-java
 Suggests: glassfish-javaee
 Description: modular Java/J2EE application framework - Web
  Spring is a layered Java/J2EE application framework offering a lot of freedom
@@ -171,7 +173,8 @@
 Package: libspring-orm-2.5-java
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-jdbc-2.5-java
-Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java
+Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
+ libeclipselink-java, libopenjpa-java
 Description: modular Java/J2EE application framework - ORM tools
  Spring is a layered Java/J2EE application framework offering a lot of freedom
  to Java developers yet providing well documented and easy-to-use solutions for

Modified: trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/main.excludes	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/excludesfiles/main.excludes	2010-07-07 23:38:12 UTC (rev 12739)
@@ -1,6 +1,5 @@
 # spring-context-support
-# BEA CommonJ is non-free
-org/springframework/scheduling/commonj/**
+# JRuby is non-free
 org/springframework/scripting/jruby/**
 
 # spring-orm
@@ -13,10 +12,3 @@
 org/springframework/transaction/jta/WebSphereUowTransactionManager.java
 org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
 org/springframework/transaction/jta/JotmFactoryBean.java
-
-# spring-web
-# JSF RI is not DFSG-free
-org/springframework/web/jsf/**
-org/springframework/web/context/request/Faces*
-# no Caucho package in Debbian
-org/springframework/remoting/caucho/**

Modified: trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes	2010-07-07 23:38:12 UTC (rev 12739)
@@ -3,10 +3,3 @@
 org/springframework/instrument/classloading/glassfish/**
 # Oracle OC4J is non-free
 org/springframework/instrument/classloading/oc4j/**
-
-# spring-orm
-org/springframework/orm/jpa/vendor/**
-
-# spring-web
-# JSF RI is not DFSG-free
-org/springframework/web/jsf/**

Modified: trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff	2010-07-07 23:38:12 UTC (rev 12739)
@@ -20,7 +20,7 @@
  		</javac>
  
  	</target>
-@@ -393,6 +396,7 @@
+@@ -393,6 +395,7 @@
  			<classpath refid="all-libs"/>
  			<classpath location="${junit4.jar}"/>
  			<classpath location="${target.classes.dir}"/>

Modified: trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff	2010-07-07 23:38:12 UTC (rev 12739)
@@ -4,7 +4,7 @@
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -538,20 +538,17 @@
+@@ -537,20 +537,17 @@
  			</manifest>
  		</jar>
  

Modified: trunk/libspring-2.5-java/debian/patches/14_portlet_api.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/14_portlet_api.diff	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/patches/14_portlet_api.diff	2010-07-07 23:38:12 UTC (rev 12739)
@@ -1,11 +1,9 @@
 Description: compatibility fixes for Portlet API 2.0
 Author: Miguel Landaeta <miguel at miguel.cc>
 Forwarded: no
-diff --git a/mock/org/springframework/mock/web/portlet/MockActionRequest.java b/mock/org/springframework/mock/web/portlet/MockActionRequest.java
-index 5ea5cf8..0632daa 100644
 --- a/mock/org/springframework/mock/web/portlet/MockActionRequest.java
 +++ b/mock/org/springframework/mock/web/portlet/MockActionRequest.java
-@@ -23,6 +23,9 @@ import java.io.InputStream;
+@@ -23,6 +23,9 @@
  import java.io.InputStreamReader;
  import java.io.Reader;
  import java.io.UnsupportedEncodingException;
@@ -15,7 +13,7 @@
  
  import javax.portlet.ActionRequest;
  import javax.portlet.PortalContext;
-@@ -128,4 +131,24 @@ public class MockActionRequest extends MockPortletRequest implements ActionReque
+@@ -128,4 +131,24 @@
  		return (this.content != null ? content.length : -1);
  	}
  
@@ -40,8 +38,6 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockActionResponse.java b/mock/org/springframework/mock/web/portlet/MockActionResponse.java
-index 58c65df..c08203f 100644
 --- a/mock/org/springframework/mock/web/portlet/MockActionResponse.java
 +++ b/mock/org/springframework/mock/web/portlet/MockActionResponse.java
 @@ -17,6 +17,7 @@
@@ -52,7 +48,7 @@
  import java.util.Collections;
  import java.util.Iterator;
  import java.util.Map;
-@@ -29,6 +30,8 @@ import javax.portlet.PortletModeException;
+@@ -29,6 +30,8 @@
  import javax.portlet.WindowState;
  import javax.portlet.WindowStateException;
  
@@ -61,7 +57,7 @@
  import org.springframework.core.CollectionFactory;
  import org.springframework.util.Assert;
  import org.springframework.util.CollectionUtils;
-@@ -160,5 +163,25 @@ public class MockActionResponse extends MockPortletResponse implements ActionRes
+@@ -160,5 +163,25 @@
  		return Collections.unmodifiableMap(this.renderParameters);
  	}
  
@@ -87,11 +83,9 @@
 +
  
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
-index 7505eaf..b9b98ea 100644
 --- a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
 +++ b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
-@@ -64,4 +64,8 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
+@@ -64,4 +64,8 @@
  		return Collections.unmodifiableMap(this.multipartFiles);
  	}
  
@@ -100,11 +94,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
-index a5c0e04..9cdc2ac 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
-@@ -21,6 +21,7 @@ import java.util.HashMap;
+@@ -21,6 +21,7 @@
  import java.util.Locale;
  import java.util.Properties;
  import java.util.ResourceBundle;
@@ -112,7 +104,7 @@
  
  import javax.portlet.PortletConfig;
  import javax.portlet.PortletContext;
-@@ -111,4 +112,28 @@ public class MockPortletConfig implements PortletConfig {
+@@ -111,4 +112,28 @@
  		return this.initParameters.keys();
  	}
  
@@ -141,11 +133,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletContext.java b/mock/org/springframework/mock/web/portlet/MockPortletContext.java
-index b823ad1..75b3c61 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletContext.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletContext.java
-@@ -251,4 +251,8 @@ public class MockPortletContext implements PortletContext {
+@@ -251,4 +251,8 @@
  		return portletContextName;
  	}
  
@@ -154,11 +144,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
-index 8c62d7b..8c66b9b 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
-@@ -38,6 +38,8 @@ import javax.portlet.PortletRequest;
+@@ -38,6 +38,8 @@
  import javax.portlet.PortletSession;
  import javax.portlet.WindowState;
  
@@ -167,7 +155,7 @@
  import org.springframework.util.Assert;
  import org.springframework.util.CollectionUtils;
  
-@@ -468,4 +470,20 @@ public class MockPortletRequest implements PortletRequest {
+@@ -468,4 +470,20 @@
  		return serverPort;
  	}
  
@@ -188,11 +176,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
-index 071206f..cc57d60 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
-@@ -22,6 +22,8 @@ import javax.portlet.PortletException;
+@@ -22,6 +22,8 @@
  import javax.portlet.PortletRequestDispatcher;
  import javax.portlet.RenderRequest;
  import javax.portlet.RenderResponse;
@@ -201,7 +187,7 @@
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
-@@ -64,4 +66,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher {
+@@ -64,4 +66,12 @@
      }
  	}
  
@@ -214,11 +200,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
-index d047c05..834892c 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
-@@ -23,6 +23,11 @@ import java.util.Set;
+@@ -23,6 +23,11 @@
  import javax.portlet.PortalContext;
  import javax.portlet.PortletResponse;
  
@@ -230,7 +214,7 @@
  import org.springframework.util.Assert;
  
  /**
-@@ -107,4 +112,20 @@ public class MockPortletResponse implements PortletResponse {
+@@ -107,4 +112,20 @@
  		return path;
  	}
  
@@ -251,11 +235,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletSession.java b/mock/org/springframework/mock/web/portlet/MockPortletSession.java
-index 6888af2..31508cc 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletSession.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletSession.java
-@@ -18,6 +18,7 @@ package org.springframework.mock.web.portlet;
+@@ -18,6 +18,7 @@
  
  import java.util.Enumeration;
  import java.util.Hashtable;
@@ -263,7 +245,7 @@
  
  import javax.portlet.PortletContext;
  import javax.portlet.PortletSession;
-@@ -186,4 +187,12 @@ public class MockPortletSession implements PortletSession {
+@@ -186,4 +187,12 @@
  		return portletContext;
  	}
  
@@ -276,8 +258,6 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletURL.java b/mock/org/springframework/mock/web/portlet/MockPortletURL.java
-index 2e60b5f..20caefc 100644
 --- a/mock/org/springframework/mock/web/portlet/MockPortletURL.java
 +++ b/mock/org/springframework/mock/web/portlet/MockPortletURL.java
 @@ -17,6 +17,8 @@
@@ -289,7 +269,7 @@
  import java.net.URLEncoder;
  import java.util.Collections;
  import java.util.Iterator;
-@@ -190,4 +192,32 @@ public class MockPortletURL implements PortletURL {
+@@ -190,4 +192,32 @@
  		}
  	}
  
@@ -322,11 +302,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
-index 5bb8c54..595a607 100644
 --- a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
 +++ b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
-@@ -67,4 +67,8 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque
+@@ -67,4 +67,8 @@
  		super(portalContext, portletContext);
  	}
  
@@ -335,11 +313,9 @@
 +	}
 +
  }
-diff --git a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
-index c63e9a4..d956196 100644
 --- a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
 +++ b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
-@@ -24,10 +24,13 @@ import java.io.PrintWriter;
+@@ -24,10 +24,13 @@
  import java.io.UnsupportedEncodingException;
  import java.io.Writer;
  import java.util.Locale;
@@ -353,7 +329,7 @@
  
  import org.springframework.web.util.WebUtils;
  
-@@ -213,4 +216,16 @@ public class MockRenderResponse extends MockPortletResponse implements RenderRes
+@@ -213,4 +216,16 @@
  		return includedUrl;
  	}
  
@@ -370,11 +346,9 @@
 +	}
 +
  }
-diff --git a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
-index 323ff7e..e045cb7 100644
 --- a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
 +++ b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
-@@ -20,6 +20,7 @@ import java.util.Collections;
+@@ -20,6 +20,7 @@
  import java.util.Enumeration;
  import java.util.Locale;
  import java.util.ResourceBundle;
@@ -382,7 +356,7 @@
  
  import javax.portlet.Portlet;
  import javax.portlet.PortletConfig;
-@@ -162,6 +163,30 @@ public class SimplePortletPostProcessor
+@@ -162,6 +163,30 @@
  		public ResourceBundle getResourceBundle(Locale locale) {
              return portletConfig == null ? null : portletConfig.getResourceBundle(locale);
  		}
@@ -413,11 +387,9 @@
  	}
  
  }
-diff --git a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
-index a9bc271..ed0378e 100644
 --- a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
 +++ b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
-@@ -26,6 +26,8 @@ import java.util.Set;
+@@ -26,6 +26,8 @@
  
  import javax.portlet.ActionRequest;
  
@@ -426,7 +398,7 @@
  import org.springframework.web.multipart.MultipartFile;
  import org.springframework.web.portlet.util.ActionRequestWrapper;
  
-@@ -161,4 +163,12 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
+@@ -161,4 +163,12 @@
  		throw new IllegalStateException("Multipart request not initialized");
  	}
  
@@ -439,11 +411,9 @@
 +	}
 +
  }
-diff --git a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
-index 470bdfb..b0bb33a 100644
 --- a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
 +++ b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
-@@ -20,6 +20,7 @@ import java.util.Enumeration;
+@@ -20,6 +20,7 @@
  import java.util.Locale;
  import java.util.Properties;
  import java.util.ResourceBundle;
@@ -451,7 +421,7 @@
  
  import javax.portlet.ActionRequest;
  import javax.portlet.ActionResponse;
-@@ -203,6 +204,29 @@ public class PortletWrappingController extends AbstractController
+@@ -203,6 +204,29 @@
  			return (portletConfig != null ? portletConfig.getResourceBundle(locale) : null);
  		}
  
@@ -481,11 +451,9 @@
  	}
  
  }
-diff --git a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
-index 3993af1..74f92f7 100644
 --- a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
 +++ b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
-@@ -75,4 +75,8 @@ public class ActionRequestWrapper extends PortletRequestWrapper implements Actio
+@@ -75,4 +75,8 @@
  		return this.actionRequest.getContentLength();
  	}
  
@@ -494,11 +462,9 @@
 +	}
 +
  }
-diff --git a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
-index 9c65318..1694992 100644
 --- a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
 +++ b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
-@@ -30,6 +30,8 @@ import javax.portlet.WindowState;
+@@ -30,6 +30,8 @@
  
  import org.springframework.util.Assert;
  
@@ -507,7 +473,7 @@
  /**
   * Simple wrapper for a {@link javax.portlet.PortletRequest}, delegating all
   * calls to the underlying request.
-@@ -194,4 +196,20 @@ public class PortletRequestWrapper implements PortletRequest {
+@@ -194,4 +196,20 @@
  		return this.portletRequest.getServerPort();
  	}
  

Added: trunk/libspring-2.5-java/debian/patches/16_commonj.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/16_commonj.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/16_commonj.diff	2010-07-07 23:38:12 UTC (rev 12739)
@@ -0,0 +1,52 @@
+Description: Compatibility with CommonJ API provided by Geronimo project
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-07-08
+Forwarded: no
+--- a/src/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
++++ b/src/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+@@ -143,20 +143,20 @@
+ 	public void execute(Runnable task) {
+ 		Assert.state(this.workManager != null, "No WorkManager specified");
+ 		Work work = new DelegatingWork(task);
+-		try {
++		//try {
+ 			if (this.workListener != null) {
+ 				this.workManager.schedule(work, this.workListener);
+ 			}
+ 			else {
+ 				this.workManager.schedule(work);
+ 			}
+-		}
+-		catch (WorkRejectedException ex) {
+-			throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
+-		}
+-		catch (WorkException ex) {
+-			throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
+-		}
++		//}
++		//catch (WorkRejectedException ex) {
++		//	throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
++		//}
++		//catch (WorkException ex) {
++		//	throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
++		//}
+ 	}
+ 
+ 	/**
+@@ -172,14 +172,12 @@
+ 	//-------------------------------------------------------------------------
+ 
+ 	public WorkItem schedule(Work work)
+-			throws WorkException, IllegalArgumentException {
+-
++	{
+ 		return this.workManager.schedule(work);
+ 	}
+ 
+ 	public WorkItem schedule(Work work, WorkListener workListener)
+-			throws WorkException, IllegalArgumentException {
+-
++	{
+ 		return this.workManager.schedule(work, workListener);
+ 	}
+ 

Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/patches/series	2010-07-07 23:38:12 UTC (rev 12739)
@@ -3,7 +3,7 @@
 03_use_debian_asm2.diff
 04_remove_oc4j_weaving.diff
 05_remove_glassfish_weaving.diff
-06_no_jsf.diff
+#06_no_jsf.diff
 08_use_glasshfish_toplink.diff
 09_junit_45.diff
 #10_jruby_11.diff
@@ -12,3 +12,4 @@
 13_tiles_22.diff
 14_portlet_api.diff
 15_fix_build_with_asm3.diff
+16_commonj.diff

Modified: trunk/libspring-2.5-java/debian/poms/spring-aop-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-aop-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-aop-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-aop</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: AOP</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: AOP</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-aspects</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Aspects</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Aspects</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-beans-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-beans-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-beans-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-beans</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Beans</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Beans</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-context-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-context-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-context-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-context</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Context</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Context</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-context-support-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-context-support-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-context-support-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-context-support</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Context Support</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Context Support</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-core-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-core-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-core-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-core</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Core</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Core</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-jdbc-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-jdbc-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-jdbc-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-jdbc</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: JDBC</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: JDBC</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-jms-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-jms-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-jms-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-jms</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: JMS</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: JMS</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-orm-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-orm-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-orm-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-orm</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: ORM</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: ORM</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-test-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-test-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-test-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-test</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Test</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Test</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-tx-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-tx-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-tx-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-tx</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Transaction</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Transaction</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-web-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-web-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-web-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-web</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Web</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Web</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-webmvc-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-webmvc-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-webmvc-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-webmvc</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Web MVC</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Web MVC</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/poms/spring-webmvc-portlet-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-webmvc-portlet-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-webmvc-portlet-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -1,95 +1,95 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-webmvc-portlet</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Web MVC Portlet</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Web MVC Portlet</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.portlet</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-webmvc-portlet</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Web MVC Portlet</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Web MVC Portlet</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Modified: trunk/libspring-2.5-java/debian/poms/spring-webmvc-struts-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-webmvc-struts-2.5.xml	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/poms/spring-webmvc-struts-2.5.xml	2010-07-07 23:38:12 UTC (rev 12739)
@@ -9,7 +9,7 @@
 	<artifactId>spring-webmvc-struts</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Framework: Web MVC Struts</name>
-	<version>2.5.6.SEC01</version>
+	<version>2.5.6.SEC02</version>
 	<description>Spring Framework: Web MVC Struts</description>
 	<url>http://www.springframework.org</url>
 	<licenses>

Modified: trunk/libspring-2.5-java/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules	2010-07-07 22:23:13 UTC (rev 12738)
+++ trunk/libspring-2.5-java/debian/rules	2010-07-07 23:38:12 UTC (rev 12739)
@@ -18,6 +18,7 @@
 
 override_dh_auto_clean:
 	$(ANT) clean
+	mh_clean
 
 override_dh_auto_build:
 	$(ANT) alljars

More information about the pkg-java-commits mailing list