[karaf] branch master updated: Minor improvement to work with different spring-security version

[jbonofre]

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/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 31c4a8c  Minor improvement to work with different spring-security 
version
31c4a8c is described below

commit 31c4a8ce0508f4c98f5d27bf0dcf564573f02609
Author: jbonofre <jbono...@apache.org>
AuthorDate: Mon Mar 8 13:58:50 2021 +0100

    Minor improvement to work with different spring-security version
---
 assemblies/features/standard/src/main/feature/feature.xml | 4 ++--
 jaas/spring-security-crypto/pom.xml                       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/assemblies/features/standard/src/main/feature/feature.xml 
b/assemblies/features/standard/src/main/feature/feature.xml
index 3f1fe34..79efb8f 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1443,8 +1443,8 @@ org.apache.felix.eventadmin.AddSubject=true
 
     <feature name="spring-security-crypto-encryption" description="Advanced 
encryption support for Karaf security" version="${project.version}">
         <feature>jaas</feature>
-        <bundle 
start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version}</bundle>
         <bundle 
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${project.version}</bundle>
     </feature>
 
diff --git a/jaas/spring-security-crypto/pom.xml 
b/jaas/spring-security-crypto/pom.xml
index eda826b..c8d85ef 100644
--- a/jaas/spring-security-crypto/pom.xml
+++ b/jaas/spring-security-crypto/pom.xml
@@ -169,6 +169,7 @@
                     <instructions>
                         <Import-Package>
                             org.osgi.framework;version="[1,3)",
+                            org.springframework.security*;version="[5.1,6)",
                             *
                         </Import-Package>
                         <Private-Package>