This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch karaf-4.3.x in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.3.x by this push: new 2c2ca04e72 [KARAF-7571] Create feature for Spring Security 5.7.3 2c2ca04e72 is described below commit 2c2ca04e72a75b4e75c3c5d2fa71ff47b0c1bd1e Author: Jean-Baptiste Onofré <jbono...@apache.org> AuthorDate: Thu Oct 13 09:42:00 2022 +0200 [KARAF-7571] Create feature for Spring Security 5.7.3 (cherry picked from commit 06b44470431d51e7417b14958e876725934c57b1) --- .../features/spring/src/main/feature/feature.xml | 18 ++++++++++++++++++ itests/test/pom.xml | 2 ++ .../test/java/org/apache/karaf/itests/BaseTest.java | 1 + .../karaf/itests/features/Spring53FeaturesTest.java | 7 ++++++- pom.xml | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index a79e1f8ab8..2b0e17cf03 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -117,6 +117,24 @@ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security56.version}</bundle> </feature> + <feature name="spring-security" description="Spring Security 5.7.x support" version="${spring.security57.version}"> + <feature>pax-web-jsp</feature> + <feature>pax-web-war</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/${javax.annotation.version}</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.security57.version}</bundle> + <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security57.version}</bundle> + <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security57.version}</bundle> + <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security57.version}</bundle> + <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security57.version}</bundle> + </feature> + <!-- Aries Blueprint Spring support --> <feature name="aries-blueprint-spring"> diff --git a/itests/test/pom.xml b/itests/test/pom.xml index 1601eacbbe..f9446fbf4e 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -328,6 +328,7 @@ <spring.security54.version>${spring.security54.version}</spring.security54.version> <spring.security55.version>${spring.security55.version}</spring.security55.version> <spring.security56.version>${spring.security56.version}</spring.security56.version> + <spring.security57.version>${spring.security57.version}</spring.security57.version> <activemq.version>${activemq.version}</activemq.version> <karaf.version>${project.version}</karaf.version> <pax.exam.configuration>file:src/test/resources/controlled-exam.properties</pax.exam.configuration> @@ -391,6 +392,7 @@ <spring.security54.version>${spring.security54.version}</spring.security54.version> <spring.security55.version>${spring.security55.version}</spring.security55.version> <spring.security56.version>${spring.security56.version}</spring.security56.version> + <spring.security57.version>${spring.security57.version}</spring.security57.version> <activemq.version>${activemq.version}</activemq.version> </systemPropertyVariables> </configuration> diff --git a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java index 4221199937..bae38913de 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java @@ -35,6 +35,7 @@ public class BaseTest extends KarafTestSupport { KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security54.version", System.getProperty("spring.security54.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security55.version", System.getProperty("spring.security55.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security56.version", System.getProperty("spring.security56.version")), + KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security57.version", System.getProperty("spring.security57.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "activemq.version", System.getProperty("activemq.version")) }; return Stream.of(super.config(), options).flatMap(Stream::of).toArray(Option[]::new); diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java index 95515d8e76..2d1c4f2199 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java @@ -88,8 +88,13 @@ public class Spring53FeaturesTest extends BaseTest { // Spring Security @Test - public void installSpringSecurityFeature() throws Exception { + public void installSpringSecurity56Feature() throws Exception { installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security56.version")); } + @Test + public void installSpringSecurity57Feature() throws Exception { + installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security57.version")); + } + } diff --git a/pom.xml b/pom.xml index 4806711948..83c0ce7e92 100644 --- a/pom.xml +++ b/pom.xml @@ -330,6 +330,7 @@ <spring.security54.version>5.4.6_1</spring.security54.version> <spring.security55.version>5.5.2_1</spring.security55.version> <spring.security56.version>5.6.3_1</spring.security56.version> + <spring.security57.version>5.7.3_1</spring.security57.version> <sling.commons.johnzon.version>1.2.14</sling.commons.johnzon.version> <sshd.version>2.9.1</sshd.version>