SEC-2506: Remove Bundlor Support

acl/template.mf

@@ -1,24 +0,0 @@
-Implementation-Title: org.springframework.security.acls
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.acls
-Bundle-Name: Spring Security Acls
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.aopalliance.*;version="${aopAllianceRange}",
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.cache.*;version="${springRange}";resolution:=optional,
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.access.*;version="${secRange}",
- org.springframework.security.util.*;version="${secRange}",
- org.springframework.context.*;version="${springRange}";resolution:=optional,
- org.springframework.dao.*;version="${springRange}";resolution:=optional,
- org.springframework.jdbc.core.*;version="${springRange}";resolution:=optional,
- org.springframework.transaction.support.*;version="${springRange}";resolution:=optional,
- org.springframework.util.*;version="${springRange}";resolution:=optional,
- net.sf.ehcache.*;version="${ehcacheRange}";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional

aspects/template.mf

@@ -1,16 +0,0 @@
-Implementation-Title: org.springframework.security.aspects
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.aspects
-Bundle-Name: Spring Security Aspects
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Bundle-Version: ${version}
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.aspectj.*;version="${aspectjRange}";resolution:=optional,
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.access.intercept.aspectj;version="${secRange}",
- org.springframework.beans.factory;version="${springRange}"

build.gradle

@@ -6,7 +6,6 @@ buildscript {
     }
     dependencies {
         classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5")
-        classpath("org.springframework.build.gradle:bundlor-plugin:0.1.2")
         classpath("org.gradle.api.plugins:gradle-tomcat-plugin:0.9.8")
         classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
         classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0')
@@ -96,13 +95,8 @@ configure(javaProjects) {
 }
 
 configure(coreModuleProjects) {
-    apply plugin: 'bundlor'
     apply plugin: 'emma'
 
-    bundlor.doFirst {
-        def templateText = file("template.mf").text
-        bundlor.manifestTemplate = new SimpleTemplateEngine().createTemplate(templateText).make(bundlorProperties).toString()
-    }
     configurations {
         jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo
     }

cas/template.mf

@@ -1,23 +0,0 @@
-Implementation-Title: org.springframework.security.cas
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.cas
-Bundle-Name: Spring Security CAS
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.jasig.cas.client.*;version="${casRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.authentication.*;version="${secRange}",
- org.springframework.security.web.*;version="${secRange}",
- org.springframework.beans.factory;version="${springRange}",
- org.springframework.cache.*;version="${springRange}";resolution:=optional,
- org.springframework.context.*;version="${springRange}",
- org.springframework.dao;version="${springRange}",
- org.springframework.util;version="${springRange}",
- net.sf.ehcache.*;version="${ehcacheRange}";resolution:=optional,
- javax.servlet.*;version="0"

config/template.mf

@@ -1,46 +0,0 @@
-Implementation-Title: org.springframework.security.config
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.config
-Bundle-Name: Spring Security Namespace Configuration
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.aopalliance.*;version="${aopAllianceRange}",
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.aopalliance.*;version="${aopAllianceRange}";resolution:=optional,
- org.aspectj.*;version="${aspectjRange}";resolution:=optional,
- org.openid4java.*;version="${openid4javaRange}";resolution:=optional,
- org.springframework.security.access.*;version="${secRange}",
- org.springframework.security.authentication.*;version="${secRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.crypto.bcrypt.*;version="${secRange}",
- org.springframework.security.crypto.password.*;version="${secRange}",
- org.springframework.security.crypto.*;version="${secRange}",
- org.springframework.security.util;version="${secRange}",
- org.springframework.security.provisioning;version="${secRange}",
- org.springframework.security.ldap.*;version="${secRange}",
- org.springframework.security.openid.*;version="${secRange}";resolution:=optional,
- org.springframework.security.web.*;version="${secRange}";resolution:=optional,
- org.springframework.security.ldap.*;version="${secRange}";resolution:=optional,
- org.springframework.security.openid.*;version="${secRange}";resolution:=optional,
- org.springframework.ldap.*;version="${springLdapRange}";resolution:=optional,
- org.springframework.aop.*;version="${springRange}";resolution:=optional,
- org.springframework.jdbc.*;version="${springRange}";resolution:=optional,
- org.springframework.http.*;version="${springRange}";resolution:=optional,
- org.springframework.beans.*;version="${springRange}",
- org.springframework.context.*;version="${springRange}",
- org.springframework.core.*;version="${springRange}",
- org.springframework.http.*;version="${springRange}",
- org.springframework.ldap.*;version="${springLdapRange}",
- org.springframework.jdbc.*;version="${springRange}",
- org.springframework.web.*;version="${springRange}",
- org.springframework.util.*;version="${springRange}",
- javax.servlet.*;version="0";resolution:=optional,
- org.openid4java.*;version="${openid4javaRange}",
- javax.sql.*;version="0";resolution:=optional,
- javax.naming.directory;version="0";resolution:=optional,
- org.w3c.dom;version="0";resolution:=optional

core/template.mf

@@ -1,30 +0,0 @@
-Implementation-Title: org.springframework.security.core
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.core
-Bundle-Name: Spring Security Core
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.aopalliance.*;version="${aopAllianceRange}",
- org.aspectj.*;version="${aspectjRange}";resolution:=optional,
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.aop.*;version="${springRange}";resolution:=optional,
- org.springframework.beans.*;version="${springRange}",
- org.springframework.cache.*;version="${springRange}";resolution:=optional,
- org.springframework.context.*;version="${springRange}",
- org.springframework.core.*;version="${springRange}",
- org.springframework.expression.*;version="${springRange}";resolution:=optional,
- org.springframework.dao.*;version="${springRange}";resolution:=optional,
- org.springframework.jdbc.*;version="${springRange}";resolution:=optional,
- org.springframework.scheduling.*;version="${springRange}";resolution:=optional,
- org.springframework.transaction.*;version="${springRange}";resolution:=optional,
- org.springframework.util;version="${springRange}",
- net.sf.ehcache.*;version="${ehcacheRange}";resolution:=optional,
- javax.annotation.security.*;version="0";resolution:=optional,
- javax.crypto.*;version="0";resolution:=optional,
- javax.security.auth.*;version="0";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional

crypto/template.mf

@@ -1,13 +0,0 @@
-Implementation-Title: org.springframework.security.crypto
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.crypto
-Bundle-Name: Spring Security Crypto
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.apache.commons.logging.*;version="${cloggingRange}",
- javax.crypto.*;version="0"

gradle/javaprojects.gradle

@@ -46,22 +46,6 @@ ext.apacheds_libs = [
          'org.apache.directory.shared:shared-ldap:0.9.15'
 ]
 
-ext.bundlorProperties = [
-    version: version,
-    secRange: "[$version, 3.3.0)",
-    springRange: "[$springVersion, 3.3.0)",
-    aspectjRange: '[1.6.0, 1.8.0)',
-    casRange: '[3.1.1, 3.2.0)',
-    cloggingRange: '[1.0.4, 2.0.0)',
-    ehcacheRange: '[1.4.1, 2.5.0)',
-    openid4javaRange: '[0.9.5, 1.0.0)',
-    springLdapRange: '[1.3.0,1.4.0)',
-    apacheDSRange: '[1.5.5, 1.6)',
-    apacheDSSharedRange: '[0.9.15, 1.0)',
-    ldapSdkRange: '[4.1, 5.0)',
-    aopAllianceRange: '[1.0.0, 2.0.0)'
-]
-
 // Integration test setup
 configurations {
     integrationTestCompile {

ldap/template.mf

@@ -1,27 +0,0 @@
-Implementation-Title: org.springframework.security.ldap
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.ldap
-Bundle-Name: Spring Security LDAP
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.apache.directory.server.*;version="${apacheDSRange}";resolution:=optional,
- org.apache.directory.shared.ldap.*;version="${apacheDSSharedRange}";resolution:=optional,
- org.springframework.ldap.*;version="${springLdapRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.crypto.*;version="${secRange}",
- org.springframework.security.authentication.*;version="${secRange}",
- org.springframework.security.provisioning.*;version="${secRange}",
- org.springframework.security.util;version="${secRange}",
- org.springframework.beans.*;version="${springRange}",
- org.springframework.context.*;version="${springRange}",
- org.springframework.core.io.*;version="${springRange}",
- org.springframework.dao.*;version="${springRange}";resolution:=optional,
- org.springframework.util.*;version="${springRange}",
- javax.naming.*;version="0";resolution:=optional,
- netscape.ldap.ber.stream;version="${ldapSdkRange}";resolution:=optional

openid/template.mf

@@ -1,19 +0,0 @@
-Implementation-Title: org.springframework.security.openid
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.openid
-Bundle-Name: Spring Security OpenID
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.authentication.*;version="${secRange}",
- org.springframework.security.web.*;version="${secRange}",
- org.springframework.beans.factory;version="${springRange}",
- org.springframework.util;version="${springRange}",
- org.openid4java.*;version="${openid4javaRange}",
- javax.servlet.*;version="0"

remoting/template.mf

@@ -1,20 +0,0 @@
-Implementation-Title: org.springframework.security.remoting
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.remoting
-Bundle-Name: Spring Security Remoting
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Excluded-Imports:
- javax.naming.*
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.aopalliance.*;version="${aopAllianceRange}",
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.security.authentication.*;version="${secRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.crypto.*;version="${secRange}",
- org.springframework.core.*;version="${springRange}",
- org.springframework.remoting.*;version="${springRange}"

taglibs/template.mf

@@ -1,25 +0,0 @@
-Implementation-Title: org.springframework.security.taglibs
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.taglibs
-Bundle-Name: Spring Security Taglibs
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.web.*;version="${secRange}",
- org.springframework.security.access.*;version="${secRange}",
- org.springframework.security.util;version="${secRange}",
- org.springframework.security.acls.*;version="${secRange}";resolution:=optional,
- org.springframework.core.*;version="${springRange}",
- org.springframework.util;version="${springRange}",
- org.springframework.beans.*;version="${springRange}",
- org.springframework.context.*;version="${springRange}",
- org.springframework.expression;version="${springRange}";resolution:=optional,
- org.springframework.web.context.*;version="${springRange}";resolution:=optional,
- org.springframework.web.util.*;version="${springRange}",
- javax.servlet.*;version="0"

web/template.mf

@@ -1,46 +0,0 @@
-Implementation-Title: org.springframework.security.web
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.web
-Bundle-Name: Spring Security Web
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Excluded-Exports:
- org.springframework.security.web.authentication.preauth.websphere
-Excluded-Imports:
- javax.naming.*,
- javax.rmi.*,
- javax.sql.*,
- javax.security.auth.*,
- org.aopalliance.*
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package
-Import-Template:
- org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.security.core.*;version="${secRange}",
- org.springframework.security.concurrent.*;version="${springRange}";resolution:=optional,
- org.springframework.security.crypto.*;version="${secRange}",
- org.springframework.security.authentication.*;version="${secRange}",
- org.springframework.security.access.*;version="${secRange}",
- org.springframework.security.util;version="${secRange}",
- org.springframework.beans.*;version="${springRange}",
- org.springframework.context.*;version="${springRange}",
- org.springframework.core;version="${springRange}",
- org.springframework.core.io;version="${springRange}",
- org.springframework.dao;version="${springRange}";resolution:=optional,
- org.springframework.expression;version="${springRange}";resolution:=optional,
- org.springframework.expression.spel.*;version="${springRange}";resolution:=optional,
- org.springframework.http.*;version="${springRange}",
- org.springframework.jdbc.*;version="${springRange}";resolution:=optional,
- org.springframework.mock.web;version="${springRange}";resolution:=optional,
- org.springframework.web.*;version="${springRange}";resolution:=optional,
- org.springframework.core.annotation.*;version="${springRange}";resolution:=optional,,
- org.springframework.web.context.*;version="${springRange}";resolution:=optional,
- org.springframework.web.filter.*;version="${springRange}",
- org.springframework.web.*;version="${springRange}",
- org.springframework.util;version="${springRange}";resolution:=optional,
- org.w3c.dom;version="0";resolution:=optional,
- org.xml.sax;version="0";resolution:=optional,
- javax.servlet.*;version="0",
- javax.xml.parsers.*;version="0";resolution:=optional