This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new b741f97 Fixing Spring Security feature location
b741f97 is described below
commit b741f97d91783306578c9cfea060632fb90e7f91
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Thu Feb 22 07:20:14 2018 +0100
Fixing Spring Security feature location
---
.../features/spring-legacy/src/main/feature/feature.xml | 11 -----------
assemblies/features/spring/src/main/feature/feature.xml | 13 +++++++++++++
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index bb40aae..223b4b1 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -433,15 +433,4 @@
<bundle
start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle>
</feature>
- <feature name="spring-security" description="Spring Security 4.2.x
support" version="${spring.security42.version}">
- <feature>war</feature>
- <feature version="[4,5)">spring-web</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security42.version}</bundle>
- </feature>
-
</features>
diff --git a/assemblies/features/spring/src/main/feature/feature.xml
b/assemblies/features/spring/src/main/feature/feature.xml
index 471cedf..7372b64 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -108,4 +108,17 @@
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.spring.extender/${aries.blueprint.spring.extender.version}</bundle>
</feature>
+ <!-- Spring security support -->
+
+ <feature name="spring-security" description="Spring Security 4.2.x
support" version="${spring.security42.version}">
+ <feature>war</feature>
+ <feature version="[4,5)">spring-web</feature>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security42.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security42.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security42.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security42.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security42.version}</bundle>
+ </feature>
+
</features>
--
To stop receiving notification emails like this one, please contact
jbono...@apache.org.
