You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/01/07 09:29:16 UTC
[karaf] branch main updated: [KARAF-7319] Upgrade to Spring Security 5.6.1
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new c0832dc [KARAF-7319] Upgrade to Spring Security 5.6.1
new 81a37bf Merge pull request #1479 from jbonofre/KARAF-7319
c0832dc is described below
commit c0832dc07489627bb70451943293afe8e83f0f51
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Jan 6 15:09:47 2022 +0100
[KARAF-7319] Upgrade to Spring Security 5.6.1
---
.../features/spring-legacy/src/main/feature/feature.xml | 17 +++++++++++++++++
assemblies/features/spring/src/main/feature/feature.xml | 14 +++++++-------
itests/test/pom.xml | 3 +++
.../src/test/java/org/apache/karaf/itests/BaseTest.java | 3 +++
.../karaf/itests/features/Spring52FeaturesTest.java | 2 +-
.../karaf/itests/features/Spring53FeaturesTest.java | 7 +++++++
pom.xml | 1 +
7 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 3e1867b..eb18156 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -343,4 +343,21 @@
<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.5.x support" version="${spring.security55.version}">
+ <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.security55.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security55.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security55.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security55.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security55.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 2216aa0..a79e1f8 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -100,21 +100,21 @@
<!-- Spring Security -->
- <feature name="spring-security" description="Spring Security 5.5.x support" version="${spring.security55.version}">
+ <feature name="spring-security" description="Spring Security 5.6.x support" version="${spring.security56.version}">
<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: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.security55.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security55.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security55.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security55.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security55.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security56.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security56.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security56.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security56.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security56.version}</bundle>
</feature>
<!-- Aries Blueprint Spring support -->
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index c7e3184..3a8a4ba 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -322,6 +322,7 @@
<spring.security53.version>${spring.security53.version}</spring.security53.version>
<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>
<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>
@@ -383,6 +384,8 @@
<spring.security42.version>${spring.security42.version}</spring.security42.version>
<spring.security53.version>${spring.security53.version}</spring.security53.version>
<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>
<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 18db2af..4221199 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
@@ -32,6 +32,9 @@ public class BaseTest extends KarafTestSupport {
KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security31.version", System.getProperty("spring.security31.version")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security42.version", System.getProperty("spring.security42.version")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security53.version", System.getProperty("spring.security53.version")),
+ 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", "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/Spring52FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring52FeaturesTest.java
index 37ea239..efb1cb6 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring52FeaturesTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring52FeaturesTest.java
@@ -111,7 +111,7 @@ public class Spring52FeaturesTest extends BaseTest {
@Test
public void installSpringSecurityFeature() throws Exception {
- installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security53.version"));
+ installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security55.version"));
}
}
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 017254c..95515d8 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
@@ -85,4 +85,11 @@ public class Spring53FeaturesTest extends BaseTest {
installAssertAndUninstallFeatures("pax-web-http", "spring-websocket/" + System.getProperty("spring53.version"));
}
+ // Spring Security
+
+ @Test
+ public void installSpringSecurityFeature() throws Exception {
+ installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security56.version"));
+ }
+
}
diff --git a/pom.xml b/pom.xml
index 0739c7e..88e85ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,7 @@
<spring.security53.version>5.3.3.RELEASE_2</spring.security53.version>
<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.1_1</spring.security56.version>
<sling.commons.johnzon.version>1.2.6</sling.commons.johnzon.version>
<sshd.version>2.8.0</sshd.version>