X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=7e7ad759188512eeb186c6d3736dfd527169f4aa;hb=86140b8db15a11cfd942892eface6a4f90329a41;hp=229c6217c536712f6bfbde387a79f902638b148e;hpb=6ad3109512715bd370bbaa75df2821c2fd8791d7;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 229c6217c..7e7ad7591 100644
--- 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.17-SNAPSHOT</version>
+	<version>2.1.29-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.17-SNAPSHOT</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.10</version.argeo-distribution>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
 		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -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>