+ backport template fix from trunk (rev 3014)

+ change pom version to 3.0.1.RELEASE-A (instead of RELEASE.A)

build.properties

@@ -1,6 +1,12 @@
+# DON'T forget to update spring-context manifest (Import-Package jpa entry)
 version=3.0.1
 release.type=release
-build.stamp=RELEASE.A
+build.stamp=RELEASE-A
+
+# osgi ranges
+spring.osgi.range="${version:[=.=.=, =.=.+1)}"
+aj.osgi.range="[1.5.4, 2.0.0)"
+
 natural.name=spring-framework
 project.name=Spring Framework
 project.key=SPR

org.springframework.aop/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aop</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.aop/template.mf

@@ -8,10 +8,10 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,

org.springframework.asm/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-asm</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
 

org.springframework.aspects/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aspects</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.aspects/template.mf

@@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.orm.jpa.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.dao.*;version="[3.0.0, 3.0.1)";resolution:=optional
+ org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.orm.jpa.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.dao.*;version=${spring.osgi.range};resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,

org.springframework.beans/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-beans</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.beans/template.mf

@@ -8,8 +8,8 @@ Import-Template:
  javax.xml.*;version="0";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 

org.springframework.context.support/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context-support</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
 

org.springframework.context.support/template.mf

@@ -16,13 +16,13 @@ Import-Template:
  org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.jdbc.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.jdbc.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.util.*;version=${spring.osgi.range}
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,

org.springframework.context/pom.xml

@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-context</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1.RELEASE.A</version>
+	<version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
 
 	<dependencies>

org.springframework.context/template.mf

@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  javax.persistence;version="[1.0.0, 3.0.0)";resolution:=optional,
- org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.orm.jpa.support;version="[3.0.2,3.0.3)";resolution:=optional,
  com.ibm.websphere.management;version="0";resolution:=optional
 Import-Template: 
  bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
@@ -25,17 +25,17 @@ Import-Template:
  net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,
  org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.joda.*;version="[1.6.0, 2.0.0)";resolution:=optional,
  org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.omg.CORBA.*;version="0";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.expression.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.expression.*;version=${spring.osgi.range};resolution:=optional,
  org.springframework.instrument.*;version="0";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.util.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 

org.springframework.core/pom.xml

@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1.RELEASE.A</version>
+	<version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
 
 	<dependencies>

org.springframework.core/template.mf

@@ -7,9 +7,9 @@ Import-Package:
 Import-Template: 
  javax.xml.*;version="0";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.asm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.asm.*;version=${spring.osgi.range};resolution:=optional,
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
- org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
  org.jboss.virtual.*;version="[2.1.0.GA, 3.0.0)";resolution:=optional,
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional

org.springframework.expression/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-expression</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.expression/template.mf

@@ -4,5 +4,5 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range}

org.springframework.instrument.tomcat/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument-tomcat</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.instrument/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
 </project>

org.springframework.integration-tests/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-integration-tests</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
   <dependencies>
     <dependency>

org.springframework.jdbc/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jdbc</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
   <dependencies>
     <dependency>

org.springframework.jdbc/template.mf

@@ -21,12 +21,12 @@ Import-Template:
  org.hsqldb.*;version="[1.8.0, 2.0.0)";resolution:=optional,
  org.apache.derby.*;version="[10.5.0, 11.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.dao.*;version="[3.0.0, 3.0.1)",
- org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.dao.*;version=${spring.osgi.range},
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,

org.springframework.jms/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jms</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.jms/template.mf

@@ -11,17 +11,17 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.jca.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.remoting.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.jca.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.remoting.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,

org.springframework.orm/pom.xml

@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-orm</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1.RELEASE.A</version>
+	<version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
 	<dependencies>
 		<dependency>

org.springframework.orm/template.mf

@@ -22,18 +22,18 @@ Import-Template:
  org.apache.openjpa.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  org.eclipse.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  org.hibernate.*;version="[3.2.0, 4.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)",
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.dao.*;version="[3.0.0, 3.0.1)",
- org.springframework.instrument.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.jdbc.*;version="[3.0.0, 3.0.1)",
- org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
- org.springframework.web.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.ui.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.aop.*;version=${spring.osgi.range},
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.dao.*;version=${spring.osgi.range},
+ org.springframework.instrument.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.jdbc.*;version=${spring.osgi.range},
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.web.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.ui.*;version=${spring.osgi.range};resolution:=optional,
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 

org.springframework.oxm/pom.xml

@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-oxm</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1.RELEASE.A</version>
+	<version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
 
 	<dependencies>

org.springframework.oxm/template.mf

@@ -11,9 +11,9 @@ Import-Template:
  org.apache.xmlbeans.*;version="[2.2.0, 3.0.0)";resolution:=optional,
  org.exolab.castor.*;version="[1.2.0, 2.0.0)";resolution:=optional,
  org.jibx.runtime.*;version="[1.1.5, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0",
  org.xml.sax.*;version="0"
 Ignored-Existing-Headers: 

org.springframework.spring-library/pom.xml

@@ -14,7 +14,7 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-library</artifactId>
   <packaging>libd</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <name>Spring Framework</name>
   <description>Spring is a layered Java/J2EE application platform, based on code published in Expert
   One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). </description>

org.springframework.spring-parent/pom.xml

@@ -14,7 +14,7 @@
   <artifactId>spring-parent</artifactId>
   <packaging>pom</packaging>
   <name>Spring Framework - Parent</name>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <description>Spring Framework Parent</description>
   <scm>
     <url>https://fisheye.springframework.org/browse/spring-framework</url>

org.springframework.test/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-test</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.test/template.mf

@@ -16,9 +16,9 @@ Import-Template:
  junit.framework.*;version="[3.8.2, 5.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,
  org.junit.*;version="[4.7.0, 5.0.0)";resolution:=optional,
- org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.*;version=${spring.osgi.range};resolution:=optional,
  org.testng.*;version="[5.10.0, 6.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 

org.springframework.transaction/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-tx</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.transaction/template.mf

@@ -15,14 +15,14 @@ Import-Template:
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.stereotype;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.stereotype;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,

org.springframework.web.portlet/pom.xml

@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc-portlet</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
 
   <dependencies>

org.springframework.web.portlet/template.mf

@@ -8,15 +8,15 @@ Import-Template:
  javax.xml.*;version="0";resolution:=optional,
  org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.http.*;version="[3.0.0, 3.0.1)",
- org.springframework.stereotype;version="[3.0.0, 3.0.1)",
- org.springframework.ui.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
- org.springframework.validation.*;version="[3.0.0, 3.0.1)",
- org.springframework.web.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.http.*;version=${spring.osgi.range},
+ org.springframework.stereotype;version=${spring.osgi.range},
+ org.springframework.ui.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range},
+ org.springframework.web.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,

org.springframework.web.servlet/pom.xml

@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-webmvc</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1.RELEASE.A</version>
+	<version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
 
 	<profiles>

org.springframework.web.servlet/template.mf

@@ -22,18 +22,18 @@ Import-Template:
  org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.apache.velocity.tools.*;version="[1.4.0, 3.0.0)";resolution:=optional,
  org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.expression.*;version="[3.0.0, 3.0.1)",
- org.springframework.format.*;version="[3.0.0, 3.0.1)",
- org.springframework.http.*;version="[3.0.0, 3.0.1)",
- org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.stereotype;version="[3.0.0, 3.0.1)",
- org.springframework.ui.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
- org.springframework.validation.*;version="[3.0.0, 3.0.1)", 
- org.springframework.web.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.expression.*;version=${spring.osgi.range},
+ org.springframework.format.*;version=${spring.osgi.range},
+ org.springframework.http.*;version=${spring.osgi.range},
+ org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.stereotype;version=${spring.osgi.range},
+ org.springframework.ui.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range}, 
+ org.springframework.web.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 

org.springframework.web.struts/pom.xml

@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-struts</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.1.RELEASE.A</version>
+  <version>3.0.1.RELEASE-A</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.1.RELEASE.A</version>
+    <version>3.0.1.RELEASE-A</version>
   </parent>
   <dependencies>
     <dependency>

org.springframework.web.struts/template.mf

@@ -13,11 +13,11 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
  org.apache.commons.validator.*;version="[1.1.4, 2.0.0)",
  org.apache.struts.*;version="[1.2.9, 2.0.0)",
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
- org.springframework.validation.*;version="[3.0.0, 3.0.1)",
- org.springframework.web.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range},
+ org.springframework.web.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0"
 Ignored-Existing-Headers: 
  Bnd-LastModified,

org.springframework.web/pom.xml

@@ -6,12 +6,12 @@
 	<groupId>org.springframework</groupId>
 	<artifactId>spring-web</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1.RELEASE.A</version>
+	<version>3.0.1.RELEASE-A</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.0.1.RELEASE.A</version>
+		<version>3.0.1.RELEASE-A</version>
 	</parent>
 
 	<dependencies>

org.springframework.web/template.mf

@@ -20,15 +20,15 @@ Import-Template:
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)",
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.remoting.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.ui.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
- org.springframework.validation.*;version="[3.0.0, 3.0.1)", 
+ org.springframework.aop.*;version=${spring.osgi.range},
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.remoting.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.ui.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range}, 
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: