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 2020/05/12 05:41:33 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6580] Provide Spring
Security 5.3.x feature
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 e1e6c53 [KARAF-6580] Provide Spring Security 5.3.x feature
e1e6c53 is described below
commit e1e6c538b221b560f275d44bdec8cbd492fcdd86
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue May 12 07:42:04 2020 +0200
[KARAF-6580] Provide Spring Security 5.3.x feature
---
assemblies/features/spring/src/main/feature/feature.xml | 16 ++++++++++++++++
itests/test/pom.xml | 2 ++
.../src/test/java/org/apache/karaf/itests/BaseTest.java | 1 +
pom.xml | 1 +
4 files changed, 20 insertions(+)
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 49dce1d..28501df 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -99,6 +99,22 @@
<!-- Spring Security -->
+ <feature name="spring-security" description="Spring Security 5.3.x support" version="${spring.security53.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>
+ <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>
+
<feature name="spring-security" description="Spring Security 5.1.x support" version="${spring.security51.version}">
<feature>war</feature>
<feature version="[5.1,6)">spring-jdbc</feature>
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index bbba285..75ec1cc 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -311,6 +311,7 @@
<spring.security31.version>${spring.security31.version}</spring.security31.version>
<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>
<activemq.version>${activemq.version}</activemq.version>
</systemPropertyVariables>
<excludes>
@@ -374,6 +375,7 @@
<spring.security31.version>${spring.security31.version}</spring.security31.version>
<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>
<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 e9534b9..625366e 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
@@ -37,6 +37,7 @@ 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.security51.version", System.getProperty("spring.security51.version")),
+ KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security53.version", System.getProperty("spring.security53.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/pom.xml b/pom.xml
index 0b7a95e..de41c4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,6 +306,7 @@
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
<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>
<sshd.version>1.7.0</sshd.version>
<derby-version>10.14.2.0</derby-version>