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 2018/02/18 17:58:36 UTC
[karaf] branch karaf-4.1.x updated: [KARAF-5602] Add spring
security 4.2.x feature
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 6713995 [KARAF-5602] Add spring security 4.2.x feature
6713995 is described below
commit 671399581fd2e502b57d2163c409732d3dc228b1
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Feb 18 07:29:00 2018 +0100
[KARAF-5602] Add spring security 4.2.x feature
---
.../features/spring-legacy/src/main/feature/feature.xml | 11 +++++++++++
itests/pom.xml | 9 ++++++++-
.../test/java/org/apache/karaf/itests/KarafTestSupport.java | 6 +++++-
.../org/apache/karaf/itests/features/Spring3FeaturesTest.java | 2 +-
.../apache/karaf/itests/features/Spring43FeaturesTest.java | 7 +++++++
pom.xml | 1 +
6 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 223b4b1..bb40aae 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -433,4 +433,15 @@
<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/itests/pom.xml b/itests/pom.xml
index d70297d..9716690 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -210,6 +210,9 @@
<spring41.version>${spring41.version}</spring41.version>
<spring42.version>${spring42.version}</spring42.version>
<spring43.version>${spring43.version}</spring43.version>
+ <spring50.version>${spring50.version}</spring50.version>
+ <spring.security31.version>${spring.security31.version}</spring.security31.version>
+ <spring.security42.version>${spring.security42.version}</spring.security42.version>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -251,11 +254,15 @@
<configuration>
<systemPropertyVariables>
<org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository>
- <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<spring31.version>${spring31.version}</spring31.version>
<spring32.version>${spring32.version}</spring32.version>
<spring40.version>${spring40.version}</spring40.version>
<spring41.version>${spring41.version}</spring41.version>
+ <spring42.version>${spring42.version}</spring42.version>
+ <spring43.version>${spring43.version}</spring43.version>
+ <spring.security31.version>${spring.security31.version}</spring.security31.version>
+ <spring.security42.version>${spring.security42.version}</spring.security42.version>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index ed5d1c0..6938e45 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -212,7 +212,11 @@ public class KarafTestSupport {
editConfigurationFilePut("etc/system.properties", "spring40.version", System.getProperty("spring40.version")),
editConfigurationFilePut("etc/system.properties", "spring41.version", System.getProperty("spring41.version")),
editConfigurationFilePut("etc/system.properties", "spring42.version", System.getProperty("spring42.version")),
- editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version"))
+ editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")),
+ editConfigurationFilePut("etc/system.properties", "spring.security31.version", System.getProperty("spring.security31.version")),
+ editConfigurationFilePut("etc/system.properties", "spring.security42.version", System.getProperty("spring.security42.version")),
+ editConfigurationFilePut("etc/branding.properties", "welcome", ""), // No welcome banner
+ editConfigurationFilePut("etc/branding-ssh.properties", "welcome", "")
};
}
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
index 201d1f9..bf21fef 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
@@ -191,7 +191,7 @@ public class Spring3FeaturesTest extends KarafTestSupport {
@Test
public void installSpringSecurityFeature() throws Exception {
- installAssertAndUninstallFeatures("spring-security");
+ installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security31.version"));
}
}
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
index 5d5f7a5..b78788f 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
@@ -85,4 +85,11 @@ public class Spring43FeaturesTest extends KarafTestSupport {
installAssertAndUninstallFeature("spring-websocket", System.getProperty("spring43.version"));
}
+ // Spring Security
+
+ @Test
+ public void installSpringSecurityFeature() throws Exception {
+ installAssertAndUninstallFeature("spring-security", System.getProperty("spring.security42.version"));
+ }
+
}
diff --git a/pom.xml b/pom.xml
index ad1c591..6207239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,6 +278,7 @@
<spring42.version>4.2.9.RELEASE_1</spring42.version>
<spring43.version>4.3.14.RELEASE_1</spring43.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
+ <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
<sshd.version>1.6.0</sshd.version>
<derby-version>10.12.1.1</derby-version>
--
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.