Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-103 - Create hybrid Spring 3.0.6 / 3.1 build.

Browse Source 
Introduced version range for Spring dependency of [3.0.6.RELEASE, 3.1.0.RC1]. This causes Maven to scan the metadata in the configured repositories to find the latest version up to Spring 3.1.0.RC1. For users having the Spring Milestone repo configured this will resolve against 3.1.0.RC1 then. All others will get the latest one from Maven Central which is 3.0.6. To let Bundlor still use 3.0.6 I've created a org.springframework.version.30 property and let template.mf use that.
This commit is contained in:
Oliver Gierke
2011-11-28 12:10:51 +01:00
parent 1fb6e70c2e
commit f0735392d9
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-data-commons-core/template.mf
View File

@@ -6,18 +6,18 @@ Import-Package:
sun.reflect;version="0";resolution:=optional
Import-Template:
com.mysema.query.*;version="[2.2.0,3.0.0)";resolution:=optional,
org.springframework.aop.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.beans.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.core.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.context.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.dao.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.util.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.expression.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.expression.spel.standard.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.expression.spel.support.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.transaction.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.validation.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
org.springframework.web.*;version="${org.springframework.version:[=.=.=,+1.0.0)}";resolution:=optional,
org.springframework.aop.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.beans.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.core.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.context.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.dao.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.util.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.expression.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.expression.spel.standard.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.expression.spel.support.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.transaction.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.validation.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
org.springframework.web.*;version="${org.springframework.version.30:[=.=.=,+1.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.joda.time.*;version="[1.6.0,2.0.0)";resolution:=optional,

3
spring-data-commons-parent/pom.xml
View File

@@ -14,7 +14,8 @@
<junit.version>4.8.1</junit.version>
<log4j.version>1.2.16</log4j.version>
<org.mockito.version>1.8.4</org.mockito.version>
<org.springframework.version>3.0.6.RELEASE</org.springframework.version>
<org.springframework.version.30>3.0.6.RELEASE</org.springframework.version.30>
<org.springframework.version>[${org.springframework.version.30}, 3.1.0.RC1]</org.springframework.version>
<org.hamcrest.version>1.2.1</org.hamcrest.version>
</properties>
<profiles>