X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=b0cf4c9bf6665b6acb4e30777f9d30116d45898d;hb=936a7c5493687bacf7ae9032787d8d2c1481732e;hp=34b67e1e0365872dee8da72940f1a6e2c914440e;hpb=404920a7b2b5c3a2248ae450218c265ec68559f6;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 34b67e1e0..b0cf4c9bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,36 +1,53 @@
-<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>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>0.4.0</version>
+		<version>2.1.32</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.14.2</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle.slc>0.14</developmentCycle.slc>
-		<developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
-		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
-		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
-		<version.slc>${developmentCycle.slc}.2</version.slc>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+		<version.slc>2.1.1</version.slc>
+		<!-- Libraries versions -->
+		<version.argeo-tp-extras>2.1.7</version.argeo-tp-extras>
 	</properties>
 	<modules>
-		<module>runtime</module>
-		<module>modules</module>
-		<module>eclipse</module>
-		<module>demo</module>
+		<!-- Runtime -->
+		<module>org.argeo.slc.api</module>
+		<module>org.argeo.slc.core</module>
+		<module>org.argeo.slc.unit</module>
+		<module>org.argeo.slc.support</module>
+		<module>org.argeo.slc.repo</module>
+		<module>org.argeo.slc.factory</module>
+
+		<!-- Modules -->
+		<module>org.argeo.slc.agent</module>
+		<module>org.argeo.slc.node.jackrabbit</module>
+		<module>org.argeo.slc.agent.jcr</module>
+		<module>org.argeo.slc.server.repo</module>
+
+		<!-- UI -->
+		<module>org.argeo.slc.client.ui</module>
+		<module>org.argeo.slc.client.ui.dist</module>
+		<module>org.argeo.slc.client.rap</module>
+
+		<module>lib</module>
 		<module>dep</module>
-		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
+		<module>demo</module>
 	</modules>
-	<url>${site.urlBase}/${developmentCycle.slc}</url>
+	<url>http://projects.argeo.org/slc/</url>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/slc/tags/argeo-slc-0.14.2</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/slc/tags/argeo-slc-0.14.2</developerConnection>
-		<url>https://svn.argeo.org/slc/tags/argeo-slc-0.14.2</url>
+		<connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
+		<url>https://svn.argeo.org/slc/trunk</url>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -41,7 +58,7 @@
 			<comments><![CDATA[
 SLC (Software Life Cycle) framework
 			   
-Copyright 2011 Mathieu Baudier
+Copyright (C) 2007-2012 Argeo GmbH
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -92,18 +109,6 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
-	<contributors>
-		<contributor>
-			<name>Philippe Rioland</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=w76gYPekGIELW7dvvImvvNzdDSJ3sgCmCXJHFngDGlA=]]></email>
-			<organization>CapCo</organization>
-			<organizationUrl>http://www.capco.com</organizationUrl>
-			<roles>
-				<role>tester</role>
-				<role>sponsor</role>
-			</roles>
-		</contributor>
-	</contributors>
 	<build>
 		<plugins>
 			<plugin>
@@ -117,67 +122,87 @@ limitations under the License.
 	</build>
 	<repositories>
 		<repository>
-			<id>argeo</id>
-			<url>http://maven.argeo.org/argeo</url>
+			<id>argeo-commons</id>
+			<url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</repository>
 		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://dev.argeo.org/maven/argeo-snapshots</url>
+			<id>argeo-tp-extras</id>
+			<url>http://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
 			<releases>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
 		</repository>
 	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>argeo-tp-extras</artifactId>
+			<version>${version.argeo-tp-extras}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:https://repo.argeo.org/data/files/java/argeo-slc-${developmentCycle.slc}</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
 		<site>
-			<id>argeo-slc-site</id>
-			<name>SLC Site</name>
-			<url>file://${site.repoBase}/${developmentCycle.slc}/</url>
+			<id>site</id>
+			<url>dav:https://repo.argeo.org/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
 		</site>
 	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>developer</id>
-			<properties>
-				<site.repoBase>file://${user.home}/dev/work/slcSite</site.repoBase>
-				<site.urlBase>${site.repoBase}</site.urlBase>
-			</properties>
-			<distributionManagement>
-				<snapshotRepository>
-					<uniqueVersion>true</uniqueVersion>
-					<id>argeo-snapshots-restricted</id>
-					<name>Argeo FOSS Snapshots Repository</name>
-					<url>scpexe://argeo.org/var/argeo/maven2/argeo-snapshots</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>release</id>
+			<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>
+				<repository>
+					<id>argeo-tp-extras</id>
+					<url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</releases>
+				</repository>
+			</repositories>
 			<distributionManagement>
+				<repository>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/java/argeo-slc-${developmentCycle.slc}</url>
+				</repository>
 				<site>
-					<id>argeo-slc-site</id>
-					<name>SLC Site</name>
-					<url>file://${site.repoBase}/${version.slc}</url>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
 				</site>
 			</distributionManagement>
 		</profile>
 	</profiles>
-
 </project>