X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=b3f1eff57cc3cf690aba4b388d57e5d07bafc56c;hb=0d17b16f0082b7404009354544ea0b9c71b48f48;hp=30284a3dadd22428eaa923615e830d2f3ffa9af1;hpb=ec69cea362bdf779112b2c497cd306ce4cfd1f6f;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 30284a3da..b3f1eff57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,26 +4,43 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>1.1.9</version>
+		<version>2.1.18-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>1.1.8-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle.slc>1.1</developmentCycle.slc>
-		<developmentCycle.startDate>2012-06-27</developmentCycle.startDate>
-		<version.slc>1.1.8-SNAPSHOT</version.slc>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+		<version.slc>2.1.1-SNAPSHOT</version.slc>
+		<!-- Libraries versions -->
+		<version.argeo-tp-extras>2.1.5</version.argeo-tp-extras>
 	</properties>
 	<modules>
-		<module>runtime</module>
-		<module>modules</module>
-		<module>plugins</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>lib</module>
-		<module>archetypes</module>
-		<module>dist</module>
+		<!-- <module>dist</module> -->
 		<module>demo</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
@@ -106,7 +123,16 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo-commons</id>
-			<url>http://repo.argeo.org/data/public/java/org.argeo.commons-1.1.x</url>
+			<url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>argeo-tp-extras</id>
+			<url>https://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -114,28 +140,56 @@ limitations under the License.
 			</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>
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/org.argeo.slc-${developmentCycle.slc}.x</url>
+			<url>dav:https://repo.argeo.org/data/files/java/argeo-slc-${developmentCycle.slc}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 		<site>
 			<id>site</id>
-			<url>dav:https://repo.argeo.org/data/files/docs/org.argeo.slc-${developmentCycle.slc}.x</url>
+			<url>dav:https://repo.argeo.org/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
 		</site>
 	</distributionManagement>
 	<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>
+				<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>localrepo</id>
-					<url>dav:http://localhost:7070/data/files/java/org.argeo.slc-${developmentCycle.slc}.x</url>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/java/argeo-slc-${developmentCycle.slc}</url>
 				</repository>
 				<site>
 					<id>site</id>
-					<url>dav:http://localhost:7070/data/files/docs/org.argeo.slc-${developmentCycle.slc}.x</url>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
 				</site>
 			</distributionManagement>
 		</profile>