You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2019/01/16 14:48:17 UTC

[servicemix-bundles] branch master updated: [SM-3922] Use optional import in spring-security bundles

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new cdc54ce  [SM-3922] Use optional import in spring-security bundles
cdc54ce is described below

commit cdc54ce839746df5a68288e8bbcc94287101572e
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Jan 16 15:44:18 2019 +0100

    [SM-3922] Use optional import in spring-security bundles
    
    Credit To: J. Brébec <je...@gmail.com>
---
 pom.xml                                      | 16 ++++++++++++++++
 spring-security-config-5.1.2.RELEASE/pom.xml |  9 +++++++++
 spring-security-core-5.1.2.RELEASE/pom.xml   |  6 ++++++
 spring-security-ldap-5.1.2.RELEASE/pom.xml   |  2 +-
 spring-security-web-5.1.2.RELEASE/pom.xml    |  4 ++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 383992a..8a879da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,22 @@
         <module>jaxb-xjc-2.3.2</module>
         <module>jaxb-runtime-2.3.2</module>
         <module>facebook4j-2.4.13</module>
+        <module>spring-security-acl-5.1.2.RELEASE</module>
+        <module>spring-security-aspects-5.1.2.RELEASE</module>
+        <module>spring-security-cas-5.1.2.RELEASE</module>
+        <module>spring-security-config-5.1.2.RELEASE</module>
+        <module>spring-security-core-5.1.2.RELEASE</module>
+        <module>spring-security-crypto-5.1.2.RELEASE</module>
+        <module>spring-security-data-5.1.2.RELEASE</module>
+        <module>spring-security-ldap-5.1.2.RELEASE</module>
+        <module>spring-security-messaging-5.1.2.RELEASE</module>
+        <module>spring-security-oauth2-client-5.1.2.RELEASE</module>
+        <module>spring-security-oauth2-core-5.1.2.RELEASE</module>
+        <module>spring-security-oauth2-jose-5.1.2.RELEASE</module>
+        <module>spring-security-remoting-5.1.2.RELEASE</module>
+        <module>spring-security-taglibs-5.1.2.RELEASE</module>
+        <module>spring-security-test-5.1.2.RELEASE</module>
+        <module>spring-security-web-5.1.2.RELEASE</module>
     </modules>
 
 </project>
diff --git a/spring-security-config-5.1.2.RELEASE/pom.xml b/spring-security-config-5.1.2.RELEASE/pom.xml
index a81c0bc..c8b6f4d 100644
--- a/spring-security-config-5.1.2.RELEASE/pom.xml
+++ b/spring-security-config-5.1.2.RELEASE/pom.xml
@@ -49,6 +49,15 @@
             org.springframework.security.config
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+			reactor.*;resolution:=optional,
+			org.aspectj.*;resolution:=optional,
+			org.openid4java.*;resolution:=optional,
+			org.springframework.jdbc.*;resolution:=optional,
+			org.springframework.messaging*;resolution:=optional,
+			org.springframework.web*;resolution:=optional,
+			org.springframework.security.messaging*;resolution:=optional,
+			org.springframework.security.oauth2*;resolution:=optional,
+			org.springframework.security.openid*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
diff --git a/spring-security-core-5.1.2.RELEASE/pom.xml b/spring-security-core-5.1.2.RELEASE/pom.xml
index 55667b4..55ad61f 100644
--- a/spring-security-core-5.1.2.RELEASE/pom.xml
+++ b/spring-security-core-5.1.2.RELEASE/pom.xml
@@ -49,6 +49,12 @@
             org.springframework.security
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+			net.sf.ehcache;resolution:="optional",
+			org.aspectj.*;resolution:="optional",
+			org.bouncycastle.*;resolution:="optional",
+			org.reactivestreams;resolution:="optional",
+			reactor.*;resolution:="optional",
+			org.springframework.jdbc.*;resolution:="optional",
             *
         </servicemix.osgi.import.pkg>
     </properties>
diff --git a/spring-security-ldap-5.1.2.RELEASE/pom.xml b/spring-security-ldap-5.1.2.RELEASE/pom.xml
index 1900e32..fbc4e9b 100644
--- a/spring-security-ldap-5.1.2.RELEASE/pom.xml
+++ b/spring-security-ldap-5.1.2.RELEASE/pom.xml
@@ -49,7 +49,7 @@
             org.springframework.security.ldap
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            com.unboundid.ldap*;resolution:=optional,
+            com.unboundid*;resolution:=optional,
             org.apache.directory*;resolution:=optional,
             netscape.ldap*;resolution:=optional, 
             *
diff --git a/spring-security-web-5.1.2.RELEASE/pom.xml b/spring-security-web-5.1.2.RELEASE/pom.xml
index 7cc5d76..40d2ad7 100644
--- a/spring-security-web-5.1.2.RELEASE/pom.xml
+++ b/spring-security-web-5.1.2.RELEASE/pom.xml
@@ -50,6 +50,10 @@
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.springframework.security.web*,
+			org.reactivestreams;resolution:=optional,
+			org.springframework.jdbc*;resolution:=optional,
+			org.springframework.web.reactive*;resolution:=optional,
+			reactor.*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>