From 4b45e5d7c2d85ef178eeb7503fa0c3050a3fb0a8 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 25 May 2008 20:55:17 +0000
Subject: [PATCH] Fixed OSGi version numbers in ranges [x,y] by adding a
 property pom.version.osgi

---
 acl/pom.xml        | 4 ++--
 cas/pom.xml        | 4 ++--
 core-tiger/pom.xml | 2 +-
 openid/pom.xml     | 4 ++--
 pom.xml            | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index 752c6cc097..8bf7ea3279 100644
--- a/acl/pom.xml
+++ b/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,
diff --git a/cas/pom.xml b/cas/pom.xml
index e3f7ac1e9a..303c38a108 100644
--- a/cas/pom.xml
+++ b/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,
diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index ed50d7177d..7884c82e40 100644
--- a/core-tiger/pom.xml
+++ b/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>
 
diff --git a/openid/pom.xml b/openid/pom.xml
index af861d8550..e7cf73c659 100644
--- a/openid/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 14f09be92b..a7d4d6c564 100644
--- a/pom.xml
+++ b/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>