Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed OSGi version numbers in ranges [x,y] by adding a property pom.version.osgi

This commit is contained in:
Luke Taylor 2008-05-25 20:55:17 +00:00
parent 45c3084502
commit 4b45e5d7c2
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acl/pom.xml
View File

@ -48,12 +48,12 @@
<properties> <properties>
<spring.osgi.export> <spring.osgi.export>
org.springframework.security.*;version=${pom.version} org.springframework.security.*;version=${pom.version.osgi}
</spring.osgi.export> </spring.osgi.export>
<spring.osgi.import> <spring.osgi.import>
net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional, net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
org.springframework.security.*;version="[${pom.version},${pom.version}]", org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
org.springframework.context.*;version="${spring.version.osgi}", org.springframework.context.*;version="${spring.version.osgi}",
org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional, org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,
org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional, org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional,

4
cas/pom.xml
View File

@ -42,11 +42,11 @@
<properties> <properties>
<spring.osgi.export> <spring.osgi.export>
org.springframework.security.*;version=${pom.version} org.springframework.security.*;version=${pom.version.osgi}
</spring.osgi.export> </spring.osgi.export>
<spring.osgi.import> <spring.osgi.import>
org.springframework.security.*;version="[${pom.version},${pom.version}]", org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
org.springframework.beans.*;version="${spring.version.osgi}", org.springframework.beans.*;version="${spring.version.osgi}",
org.springframework.context.*;version="${spring.version.osgi}", org.springframework.context.*;version="${spring.version.osgi}",
org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional, org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,

2
core-tiger/pom.xml
View File

@ -89,7 +89,7 @@
<spring.osgi.import> <spring.osgi.import>
javax.annotation.*;version="[1.0.0, 2.0.0)", javax.annotation.*;version="[1.0.0, 2.0.0)",
org.springframework.security.*;version="[${pom.version},${pom.version}]", org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
org.springframework.core.*;version="${spring.version.osgi}" org.springframework.core.*;version="${spring.version.osgi}"
</spring.osgi.import> </spring.osgi.import>

4
openid/pom.xml
View File

@ -41,14 +41,14 @@
<properties> <properties>
<spring.osgi.export> <spring.osgi.export>
org.springframework.security.*;version=${pom.version} org.springframework.security.*;version=${pom.version.osgi}
</spring.osgi.export> </spring.osgi.export>
<spring.osgi.import> <spring.osgi.import>
javax.servlet.*;version="[2.4.0, 3.0.0)", javax.servlet.*;version="[2.4.0, 3.0.0)",
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
org.openid4java.*;version="[0.9.3, 1.0.0)", org.openid4java.*;version="[0.9.3, 1.0.0)",
org.springframework.security.*;version="[${pom.version},${pom.version}]", org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
org.springframework.beans.*;version="${spring.version.osgi}", org.springframework.beans.*;version="${spring.version.osgi}",
org.springframework.util.*;version="${spring.version.osgi}" org.springframework.util.*;version="${spring.version.osgi}"
</spring.osgi.import> </spring.osgi.import>

1
pom.xml
View File

@ -732,6 +732,7 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<properties> <properties>
<pom.version.osgi>2.0.2.SNAPSHOT</pom.version.osgi>
<spring.version>2.0.8</spring.version> <spring.version>2.0.8</spring.version>
<spring.version.osgi>[2.0.8, 3.0.0)</spring.version.osgi> <spring.version.osgi>[2.0.8, 3.0.0)</spring.version.osgi>
<jstl.version>1.1.2</jstl.version> <jstl.version>1.1.2</jstl.version>