X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=b61f5928aaa7c3a6555f36d287e44d2814aa9ccf;hb=9156571082d99365a1fa61a9ee83c8b191b9d014;hp=6ee79b99cfb264756016fcf1e27418fdff1f2fc0;hpb=19363ac258912819b1acaa96c17718fb5030fff1;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 6ee79b99c..04adc5e02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,36 +3,47 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>1.1.5</version>
+		<version>2.1.48-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>1.1.4</version>
+	<version>2.1.6-SNAPSHOT</version>
 	<properties>
-		<version.argeo-commons>1.1.5</version.argeo-commons>
-		<developmentCycle.slc>1.1</developmentCycle.slc>
-		<developmentCycle.startDate>2012-06-27</developmentCycle.startDate>
-		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
-		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
-		<version.slc>[1.1,1.2)</version.slc>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+		<version.slc>2.1.6-SNAPSHOT</version.slc>
 	</properties>
 	<modules>
-		<module>runtime</module>
-		<module>modules</module>
-		<module>plugins</module>
-		<module>dep</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.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>archetypes</module>
+		<module>dep</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-1.1.4</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/slc/tags/argeo-slc-1.1.4</developerConnection>
-		<url>https://svn.argeo.org/slc/tags/argeo-slc-1.1.4</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>
@@ -107,25 +118,68 @@ limitations under the License.
 	</build>
 	<repositories>
 		<repository>
-			<id>argeo-commons</id>
-			<url>http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.commons-1.1.x</url>
+			<id>argeo</id>
+			<url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-	</repositories>
-	<distributionManagement>
+		<!-- Disable Maven default repository -->
 		<repository>
-			<id>staging</id>
-			<url>dav:https://repo.argeo.org/org.argeo.jcr.webapp/webdav/java/org.argeo.slc-1.1.x</url>
-			<uniqueVersion>false</uniqueVersion>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
-		<site>
-			<id>argeo-slc-site</id>
-			<name>SLC Site</name>
-			<url>file:///srv/projects/www/slc/site/${version.slc}</url>
-		</site>
-	</distributionManagement>
+	</repositories>
+	<profiles>
+		<profile>
+			<id>localrepo</id>
+			<repositories>
+				<repository>
+					<id>argeo-tp</id>
+					<url>http://localhost:7070/data/public/java/argeo-${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> -->
+				<repository>
+					<id>argeo-commons</id>
+					<url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</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>staging</id>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
+				</site>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>