浏览代码

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

Luke Taylor 17 年之前
父节点
当前提交
4b45e5d7c2
共有 5 个文件被更改,包括 9 次插入8 次删除
  1. 2 2
      acl/pom.xml
  2. 2 2
      cas/pom.xml
  3. 1 1
      core-tiger/pom.xml
  4. 2 2
      openid/pom.xml
  5. 2 1
      pom.xml

+ 2 - 2
acl/pom.xml

@@ -48,12 +48,12 @@
     
     <properties>
         <spring.osgi.export>
-            org.springframework.security.*;version=${pom.version}
+            org.springframework.security.*;version=${pom.version.osgi}
         </spring.osgi.export>
             
         <spring.osgi.import>
             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.dao.*;version="${spring.version.osgi}";resolution:=optional,
             org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional,

+ 2 - 2
cas/pom.xml

@@ -42,11 +42,11 @@
     
     <properties>
       	<spring.osgi.export>
-      	    org.springframework.security.*;version=${pom.version}
+      	    org.springframework.security.*;version=${pom.version.osgi}
       	</spring.osgi.export>
             
     	<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.context.*;version="${spring.version.osgi}",
             org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,

+ 1 - 1
core-tiger/pom.xml

@@ -89,7 +89,7 @@
             
     	<spring.osgi.import>
     	    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}"
     	</spring.osgi.import>
 

+ 2 - 2
openid/pom.xml

@@ -41,14 +41,14 @@
 
     <properties>
         <spring.osgi.export>
-            org.springframework.security.*;version=${pom.version}
+            org.springframework.security.*;version=${pom.version.osgi}
         </spring.osgi.export>
             
         <spring.osgi.import>
             javax.servlet.*;version="[2.4.0, 3.0.0)",
             org.apache.commons.logging.*;version="[1.1.1, 2.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.util.*;version="${spring.version.osgi}"
         </spring.osgi.import>

+ 2 - 1
pom.xml

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