You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2016/05/27 07:23:10 UTC

[2/6] servicemix-bundles git commit: SM-3000 : spring-security-config 3.2.8_RELEASE_1 does not contains spring schemas and handlers

SM-3000 : spring-security-config 3.2.8_RELEASE_1 does not contains spring schemas and handlers


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/85aa1c06
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/85aa1c06
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/85aa1c06

Branch: refs/heads/master
Commit: 85aa1c060a1e43a105ebe9376f367ed1cbefa55b
Parents: cb4fcc5
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed May 25 11:24:17 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed May 25 11:24:17 2016 +0200

----------------------------------------------------------------------
 pom.xml                                      |  1 +
 spring-security-config-3.2.8.RELEASE/pom.xml | 31 +++++++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/85aa1c06/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 74237fa..415be75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@
         <module>kafka_2.10-0.10.0.0</module>
         <module>kafka-clients-0.10.0.0</module>
         <module>facebook4j-2.4.4</module>
+        <module>spring-security-config-3.2.8.RELEASE</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/85aa1c06/spring-security-config-3.2.8.RELEASE/pom.xml
----------------------------------------------------------------------
diff --git a/spring-security-config-3.2.8.RELEASE/pom.xml b/spring-security-config-3.2.8.RELEASE/pom.xml
index 8acaaba..4169c50 100644
--- a/spring-security-config-3.2.8.RELEASE/pom.xml
+++ b/spring-security-config-3.2.8.RELEASE/pom.xml
@@ -51,18 +51,18 @@
         <servicemix.osgi.import.pkg>
             javax.servlet;resolution:=optional;version=0,
             javax.servlet.http;resolution:=optional;version=0,
-	    org.apache.commons.logging;version="[1.0.4, 2.0.0)",
-	    org.aspectj.weaver.tools;resolution:=optional;version="[1.7, 2)",
-	    org.springframework.aop*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.beans*;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.context*;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.core*;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.security*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.security.web*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
+            org.apache.commons.logging;version="[1.0.4, 2.0.0)",
+            org.aspectj.weaver.tools;resolution:=optional;version="[1.7, 2)",
+            org.springframework.aop*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
+            org.springframework.beans*;version="[${pkgVersion}, 3.3.0)",
+            org.springframework.context*;version="[${pkgVersion}, 3.3.0)",
+            org.springframework.core*;version="[${pkgVersion}, 3.3.0)",
+            org.springframework.security*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
+            org.springframework.security.web*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
             org.springframework.web*;resolution:=optional;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.util;version="[${pkgVersion}, 3.3.0)",
-	    org.springframework.util.xml;version="[${pkgVersion}, 3.3.0)",
-	    org.w3c.dom;resolution:=optional;version=0,
+            org.springframework.util;version="[${pkgVersion}, 3.3.0)",
+            org.springframework.util.xml;version="[${pkgVersion}, 3.3.0)",
+            org.w3c.dom;resolution:=optional;version=0,
             javax.sql;resolution:=optional, 
             org.aopalliance.intercept;resolution:=optional, 
             org.openid4java.consumer;resolution:=optional, 
@@ -108,9 +108,12 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>**/*.gif</include>
+                                        <include>**/*.xsd</include>
+                                        <include>**/*.xml</include>
+                                        <include>META-INF/spring*</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>