karaf-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (KARAF-5602) Upgrade to Spring Security 4.2.4.RELEASE
Date Sun, 18 Feb 2018 17:30:00 GMT

    [ https://issues.apache.org/jira/browse/KARAF-5602?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16368603#comment-16368603
] 

ASF GitHub Bot commented on KARAF-5602:
---------------------------------------

jbonofre closed pull request #453: [KARAF-5602] Add spring security 4.2.x feature
URL: https://github.com/apache/karaf/pull/453
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index c3676bb294..10851b440a 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -510,4 +510,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 d12ceaa4cf..50ff99d64b 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -266,6 +266,8 @@
                         <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>
                         <activemq.version>${activemq.version}</activemq.version>
                     </systemPropertyVariables>
                     <excludes>
@@ -315,11 +317,16 @@
                             </excludes>
                             <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>
+                                <spring50.version>${spring50.version}</spring50.version>
+                                <spring.security31.version>${spring.security31.version}</spring.security31.version>
+                                <spring.security42.version>${spring.security42.version}</spring.security42.version>
                                 <activemq.version>${activemq.version}</activemq.version>
                     		</systemPropertyVariables>
                         </configuration>
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 56a6ee45de..22218eeae7 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -218,6 +218,8 @@ public File getConfigFile(String path) {
             editConfigurationFilePut("etc/system.properties", "spring42.version", System.getProperty("spring42.version")),
             editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")),
             editConfigurationFilePut("etc/system.properties", "spring50.version", System.getProperty("spring50.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/system.properties", "activemq.version", System.getProperty("activemq.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 201d1f9963..bf21fef8c0 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 void installSpringWebPortletFeature() throws Exception {
 
     @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 d5d43397db..6973369008 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
@@ -107,4 +107,11 @@ public void installSpringWebSocketFeature() throws Exception {
         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 b2e9499a93..66c5af8c13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,6 +294,7 @@
         <spring43.version>4.3.14.RELEASE_1</spring43.version>
         <spring50.version>5.0.3.RELEASE_1</spring50.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.7.0</sshd.version>
         <derby-version>10.12.1.1</derby-version>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> Upgrade to Spring Security 4.2.4.RELEASE
> ----------------------------------------
>
>                 Key: KARAF-5602
>                 URL: https://issues.apache.org/jira/browse/KARAF-5602
>             Project: Karaf
>          Issue Type: Dependency upgrade
>          Components: karaf-core
>            Reporter: Jean-Baptiste Onofré
>            Assignee: Jean-Baptiste Onofré
>            Priority: Major
>             Fix For: 4.2.0
>
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message