X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=a29bb72b8e8950c23f0bbc41ee31ea7812ce89ba;hb=d28ceea9dd8b82f6808cf93d088f5e43423949a1;hp=31413e4eced49e40af3bc95c103807d5e975081b;hpb=74dda001a81e5973b55f06ef8ba26be1431e44a1;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 31413e4ec..a29bb72b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.13</version>
+	<version>2.1.30-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.13</version.argeo-commons>
+		<version.argeo-commons>2.1.30-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.5</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>
@@ -25,37 +25,25 @@
 		<!-- Security -->
 		<module>org.argeo.security.core</module>
 		<module>org.argeo.security.jackrabbit</module>
-		<module>org.argeo.security.ldap</module>
-		<!-- Security Services -->
-		<!-- <module>org.argeo.security.auth.ldap</module> -->
-		<!-- <module>org.argeo.security.dao.ldap</module> -->
-		<!-- <module>org.argeo.security.dao.cli</module> -->
-		<!-- <module>org.argeo.security.dao.jackrabbit</module> -->
-		<!-- Server -->
-		<module>org.argeo.server.core</module>
-		<!-- <module>org.argeo.server.jcr.mvc</module> -->
-		<module>org.argeo.server.jackrabbit</module>
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
-		<!-- Argeo Node -->
-		<!-- <module>org.argeo.node.repo.jackrabbit</module> -->
+		<!-- CMS -->
 		<module>org.argeo.cms</module>
 		<!-- Workbench -->
 		<module>org.argeo.eclipse.ui.workbench</module>
 		<module>org.argeo.eclipse.ui.workbench.rap</module>
-		<!-- <module>org.argeo.security.equinox</module> -->
 		<module>org.argeo.security.ui</module>
 		<module>org.argeo.security.ui.admin</module>
 		<module>org.argeo.security.ui.rap</module>
-		<!-- Dependencies and Distributions -->
+		<!-- Distribution -->
 		<module>dep</module>
 		<module>dist</module>
 	</modules>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.13</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.13</developerConnection>
-		<url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.13</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>
@@ -143,6 +131,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>
@@ -276,7 +266,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.3</version>
+					<version>1.1.4</version>
 				</plugin>
 				<!-- Site -->
 				<plugin>
@@ -408,12 +398,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>
@@ -451,9 +471,20 @@ limitations under the License.
 	<profiles>
 		<profile>
 			<id>localrepo</id>
+			<repositories>
+				<repository>
+					<id>argeo-tp</id>
+					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</releases>
+				</repository>
+			</repositories>
 			<distributionManagement>
 				<repository>
-					<id>localrepo</id>
+					<id>staging</id>
 					<name>Internal Release Repository</name>
 					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 				</repository>