From 62986c700be70cb85a0d19ac20ddfe842910a47b Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 11 Nov 2008 01:09:37 +0000
Subject: [PATCH] SEC-1027: Removed bnd plugin and 'bundle' package types from
 pom.xml files

---
 acl/pom.xml    | 26 +-----------------------
 cas/pom.xml    | 30 +++------------------------
 core/pom.xml   | 55 +-------------------------------------------------
 openid/pom.xml | 23 +--------------------
 pom.xml        | 31 ----------------------------
 5 files changed, 6 insertions(+), 159 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index 1f89807955..19940c0e59 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -9,7 +9,7 @@
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-acl</artifactId>
     <name>Spring Security - ACL module</name>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -62,28 +62,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <spring.osgi.export>
-            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.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,
-            org.springframework.transaction.support.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.util.*;version="${spring.version.osgi}",
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            javax.sql.*
-        </spring.osgi.import>
-
-        <spring.osgi.private.pkg>
-            !org.springframework.security.*
-        </spring.osgi.private.pkg>
-
-        <spring.osgi.symbolic.name>org.springframework.security.acls</spring.osgi.symbolic.name>
-    </properties>
-
 </project>
diff --git a/cas/pom.xml b/cas/pom.xml
index dc01a6030c..90c4075049 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <artifactId>spring-security-cas-client</artifactId>
     <name>Spring Security - CAS support</name>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -21,7 +21,7 @@
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
-        </dependency>    
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -46,29 +46,5 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-    
-    <properties>
-      	<spring.osgi.export>
-      	    org.springframework.security.*;version=${pom.version.osgi}
-      	</spring.osgi.export>
-            
-    	<spring.osgi.import>
-    	    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,
-            org.springframework.util.*;version="${spring.version.osgi}",
-            javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
-            net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            org.jasig.cas.client.*;version="[3.1.3, 4.0.0)"
-    	</spring.osgi.import>
-
-    	<spring.osgi.private.pkg>
-    	    !org.springframework.security.*
-    	</spring.osgi.private.pkg>
 
-    	<spring.osgi.symbolic.name>org.springframework.security.cas</spring.osgi.symbolic.name>        
-    </properties>    
-    
-</project>
\ No newline at end of file
+</project>
diff --git a/core/pom.xml b/core/pom.xml
index 9394fb66bd..2ee35d8133 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
         <artifactId>spring-security-parent</artifactId>
         <version>2.5.0-SNAPSHOT</version>
     </parent>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <artifactId>spring-security-core</artifactId>
     <name>Spring Security - Core</name>
 
@@ -139,57 +139,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-          <spring.osgi.export>
-              org.springframework.security.*;version=${pom.version}
-          </spring.osgi.export>
-
-        <spring.osgi.import>
-            !com.ibm.websphere.security,
-            javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
-            net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
-            org.aopalliance.*;version="[1.0.0, 2.0.0)",
-            org.apache.commons.codec.*;version="[1.3.0, 2.0.0)",
-            org.apache.commons.collections.*;version="[3.2.0, 4.0.0)",
-            org.apache.commons.lang.*;version="[2.1.0, 3.0.0)",
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            org.apache.directory.server.configuration.*;version="[1.0.2, 2.0.0)";resolution:=optional,
-            org.apache.directory.server.core.*;version="[1.0.2, 2.0.0)";resolution:=optional,
-            org.apache.directory.server.protocol.*;version="[1.0.2, 2.0.0)";resolution:=optional,
-            org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
-            org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
-            org.springframework.aop.*;version="${spring.version.osgi}",
-            org.springframework.beans.*;version="${spring.version.osgi}",
-            org.springframework.context.*;version="${spring.version.osgi}",
-            org.springframework.core.*;version="${spring.version.osgi}",
-            org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.ldap.*;version="[1.2.1.A, 2.0.0)";resolution:=optional,
-            org.springframework.metadata.*;version="${spring.version.osgi}",
-            org.springframework.mock.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.remoting.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.util.*;version="${spring.version.osgi}",
-            org.springframework.web.*;version="${spring.version.osgi}";resolution:=optional,
-            javax.crypto.*,
-            javax.naming.*,
-            javax.rmi.*,
-            javax.security.*,
-            javax.sql.*,
-            javax.xml.parsers.*,
-            org.w3c.dom.*,
-            org.xml.sax.*,
-            *;resolution:=optional
-        </spring.osgi.import>
-
-        <spring.osgi.private.pkg>
-            !org.springframework.security.*
-        </spring.osgi.private.pkg>
-<!--
-        <spring.osgi.include.res>
-            src/main/resources
-        </spring.osgi.include.res>
--->
-        <spring.osgi.symbolic.name>org.springframework.security.core</spring.osgi.symbolic.name>
-    </properties>
-
 </project>
diff --git a/openid/pom.xml b/openid/pom.xml
index 118ac7e07a..f919a720a6 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -9,7 +9,7 @@
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
     <version>2.5.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -46,25 +46,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <spring.osgi.export>
-            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.osgi},${pom.version.osgi}]",
-            org.springframework.beans.*;version="${spring.version.osgi}",
-            org.springframework.util.*;version="${spring.version.osgi}"
-        </spring.osgi.import>
-
-        <spring.osgi.private.pkg>
-            !org.springframework.security.*
-        </spring.osgi.private.pkg>
-
-        <spring.osgi.symbolic.name>org.springframework.security.openid</spring.osgi.symbolic.name>
-    </properties>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 0dc15154a2..2b3c8ab010 100644
--- a/pom.xml
+++ b/pom.xml
@@ -434,35 +434,6 @@
                     </postProcess>
                 </configuration>
             </plugin>
-             <!-- OSGi Felix bundle plugin -->
-             <plugin>
-                 <groupId>org.apache.felix</groupId>
-                 <artifactId>maven-bundle-plugin</artifactId>
-                 <version>1.4.0</version>
-                 <extensions>true</extensions>
-
-                 <configuration>
-                     <obrRepository>NONE</obrRepository>        
-                     <instructions>
-                         <!-- bundle specific conf -->      
-                         <Bundle-Name>${artifactId}</Bundle-Name>
-                         <Bundle-SymbolicName>${spring.osgi.symbolic.name}</Bundle-SymbolicName>
-                         <Bundle-Vendor>SpringSource</Bundle-Vendor>
-                         <Export-Package>${spring.osgi.export}</Export-Package>
-                         <Import-Package>${spring.osgi.import}</Import-Package>
-                         <Private-Package>${spring.osgi.private.pkg}</Private-Package>
-                         <!--Include-Resource>${spring.osgi.include.res}</Include-Resource-->
-                         <!-- jar entries -->
-                         <Implementation-Title>Spring Security</Implementation-Title>
-                         <Implementation-Version>${pom.version}</Implementation-Version>
-                         <Implementation-Vendor>SpringSource</Implementation-Vendor>
-                         <Implementation-Vendor-Id>org.springframework.security</Implementation-Vendor-Id>
-                         <!-- Spring specific entries -->                         
-                         <!--Spring-Version>${spring.maven.artifact.version}</Spring-Version-->
-                     </instructions>
-                     <excludeDependencies>true</excludeDependencies> 
-                 </configuration>
-             </plugin>             
         </plugins>
     </build>
 
@@ -720,9 +691,7 @@
         </dependencies>
     </dependencyManagement>
     <properties>
-        <pom.version.osgi>2.0.3.RELEASE</pom.version.osgi>
         <spring.version>2.5.5</spring.version>
-        <spring.version.osgi>[2.5.5, 3.1.0)</spring.version.osgi>
         <jstl.version>1.1.2</jstl.version>
         <jetty.version>6.1.11</jetty.version>