This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 617581d [KARAF-7067] Provide Spring Security 5.4.2 feature
617581d is described below
commit 617581d8b917fc497d6a9bf24789a9c53f2714e7
Author: jbonofre <[email protected]>
AuthorDate: Sun Mar 7 14:08:46 2021 +0100
[KARAF-7067] Provide Spring Security 5.4.2 feature
(cherry picked from commit 84de1737c3afc81f81df5ef144e237957b3ff20b)
---
.../spring-legacy/src/main/feature/feature.xml | 17 +++++++++++++++++
.../features/spring/src/main/feature/feature.xml | 19 ++++++++++---------
itests/test/pom.xml | 2 ++
pom.xml | 1 +
4 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 2bb8d65..ef73b0f 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -756,4 +756,21 @@
<bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security42.version}</bundle>
</feature>
+ <feature name="spring-security" description="Spring Security 5.3.x
support" version="${spring.security53.version}">
+ <feature>pax-web-war</feature>
+ <feature version="[5.1,6)">spring-jdbc</feature>
+ <feature version="[5.1,6)">spring-tx</feature>
+ <feature version="[5.1,6)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/1.3</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <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.security53.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security53.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security53.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security53.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security53.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 8897eb3..00c4b60 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -99,20 +99,21 @@
<!-- Spring Security -->
- <feature name="spring-security" description="Spring Security 5.3.x
support" version="${spring.security53.version}">
+ <feature name="spring-security" description="Spring Security 5.4.x
support" version="${spring.security54.version}">
<feature>war</feature>
- <feature version="[5.1,6)">spring-jdbc</feature>
- <feature version="[5.1,6)">spring-tx</feature>
- <feature version="[5.1,6)">spring-web</feature>
+ <feature version="[5.2,6)">spring-jdbc</feature>
+ <feature version="[5.2,6)">spring-tx</feature>
+ <feature version="[5.2,6)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/1.3</bundle>
<bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
<bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
<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.security53.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security53.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security53.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security53.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security53.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security54.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security54.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security54.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security54.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security54.version}</bundle>
</feature>
<feature name="spring-security" description="Spring Security 5.1.x
support" version="${spring.security51.version}">
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index 965d43f..3a3054c 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -325,6 +325,7 @@
<spring.security42.version>${spring.security42.version}</spring.security42.version>
<spring.security51.version>${spring.security51.version}</spring.security51.version>
<spring.security53.version>${spring.security53.version}</spring.security53.version>
+
<spring.security54.version>${spring.security54.version}</spring.security54.version>
<activemq.version>${activemq.version}</activemq.version>
<pax.exam.configuration>file:src/test/resources/controlled-exam.properties</pax.exam.configuration>
</systemPropertyVariables>
@@ -391,6 +392,7 @@
<spring.security42.version>${spring.security42.version}</spring.security42.version>
<spring.security51.version>${spring.security51.version}</spring.security51.version>
<spring.security53.version>${spring.security53.version}</spring.security53.version>
+
<spring.security54.version>${spring.security54.version}</spring.security54.version>
<activemq.version>${activemq.version}</activemq.version>
</systemPropertyVariables>
</configuration>
diff --git a/pom.xml b/pom.xml
index 32ce939..166e861 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,6 +308,7 @@
<spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
<spring.security51.version>5.1.5.RELEASE_1</spring.security51.version>
<spring.security53.version>5.3.1.RELEASE_1</spring.security53.version>
+ <spring.security54.version>5.4.2_1</spring.security54.version>
<sshd.version>2.5.1</sshd.version>
<derby-version>10.14.2.0</derby-version>
