Add Spring Security

git-svn-id: https://svn.argeo.org/slc/trunk@2676 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 2e75d4664e85ff2358d91fd2281acb3783cd6550..4f5a95cc55bad18ec30a968d0e193a3343eff9d0 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -136,12 +136,13 @@
                        <artifactId>com.springsource.com.mysql.jdbc</artifactId>
                </dependency>
 
-               <!-- Spring Security
+               <!--
+                       Spring Security -->
                <dependency>
                        <groupId>org.springframework.security</groupId>
                        <artifactId>org.springframework.security</artifactId>
-               </dependency> -->
-               
+               </dependency>
+
                <!-- Required in JDK 1.5 -->
                <dependency>
                        <groupId>com.sun.xml</groupId>

diff --git a/pom.xml b/pom.xml
index 8a5c737f6061bf2e348d668ff47562d49b9c107e..9d6fe1da095c7791bd550eb9dcb86dacec06adf3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -504,6 +504,19 @@ limitations under the License.
                                <version>1.0.0.argeo4</version>
                        </dependency>
 
+                       <!-- Security -->
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>org.springframework.security</artifactId>
+                               <version>2.0.4.A</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.springframework</groupId>
+                                               <artifactId>org.springframework.web</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
                        <!-- AOP -->
                        <dependency>
                                <groupId>org.aspectj</groupId>
@@ -685,13 +698,6 @@ limitations under the License.
                                <version>2.0.8</version>
                        </dependency>
 
-                       <!-- Security
-                       <dependency>
-                               <groupId>org.springframework.security</groupId>
-                               <artifactId>org.springframework.security</artifactId>
-                               <version>2.0.4.A</version>
-                       </dependency>
- -->
                        <!-- Tomcat -->
                        <dependency>
                                <groupId>org.apache.catalina</groupId>