Simplify authentication

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a396c7e18aeb70525117426e494fde0cc1a789ae..04d5d5b6cd9df81772fb147f56ddc4a0d55ab570 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.14</version>
+       <version>2.1.29-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.14</version.argeo-commons>
+               <version.argeo-commons>2.1.29-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.6</version.argeo-distribution>
+               <version.argeo-distribution>2.1.11</version.argeo-distribution>
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -41,9 +42,9 @@
                <module>dist</module>
        </modules>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.14</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.14</developerConnection>
-               <url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.14</url>
+               <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
+               <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -131,6 +132,8 @@ limitations under the License.
                                                <source>1.7</source>
                                                <target>1.7</target>
                                                <compilerId>eclipse</compilerId>
+                                               <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
+                                               <optimize>true</optimize>
                                                <!-- Hack to work around issues with generated annotations : -->
                                                <generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
                                                <generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
@@ -396,12 +399,42 @@ limitations under the License.
                        <artifactId>argeo-tp</artifactId>
                        <version>${version.argeo-distribution}</version>
                        <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring</groupId>
+                                       <artifactId>org.springframework.ldap</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.acls</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.aspects</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.config</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.core</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.ldap</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.web</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        </dependencies>
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+                       <url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>