+ backport template fix from trunk (rev 3014)

+ change pom version to 3.0.1.RELEASE-A (instead of RELEASE.A)
This commit is contained in:
Costin Leau
2010-02-19 11:36:31 +00:00
parent 677b0b54fc
commit 4cf2504fb4
41 changed files with 157 additions and 151 deletions
+2 -2
View File
@@ -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>
+7 -7
View File
@@ -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: