X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=5ffd6073e501670ee5a71b69e98466e73d02a2ae;hb=2a00e308e58352d94abdd740415ca5ed34e7bdfb;hp=9a417fe719876154d1a678195a848d8cd8cd79f4;hpb=0251574d5d704018b6f336d0f10ed1aae57290f4;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 9a417fe71..5ffd6073e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,21 +4,20 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.17-SNAPSHOT</version>
+		<version>2.1.46</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.1-SNAPSHOT</version>
+	<version>2.1.5-SNAPSHOT</version>
 	<properties>
 		<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>
+		<version.slc>2.1.5-SNAPSHOT</version.slc>
 	</properties>
 	<modules>
+		<!-- Runtime -->
 		<module>org.argeo.slc.api</module>
 		<module>org.argeo.slc.core</module>
 		<module>org.argeo.slc.unit</module>
@@ -26,15 +25,21 @@
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
 
-		<!-- <module>runtime</module> -->
-		<!-- <module>modules</module> -->
-		<!-- <module>plugins</module> -->
-		<!-- <module>archetypes</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>
 
-		<!-- <module>lib</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>dist</module> -->
-		<!-- <module>demo</module> -->
+		<module>dist</module>
+		<module>demo</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
@@ -115,59 +120,51 @@ limitations under the License.
 	</build>
 	<repositories>
 		<repository>
-			<id>argeo-commons</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</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>
+		<!-- Disable Maven default repository -->
 		<repository>
-			<id>argeo-tp-extras</id>
-			<url>https://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
 			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
+				<enabled>false</enabled>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</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/argeo-slc-${developmentCycle.slc}</url>
-			<uniqueVersion>false</uniqueVersion>
-		</repository>
-		<site>
-			<id>site</id>
-			<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>
+					<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-tp-extras</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url>
+					<id>argeo-commons</id>
+					<url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -181,7 +178,7 @@ limitations under the License.
 					<url>dav:http://localhost:7070/data/files/java/argeo-slc-${developmentCycle.slc}</url>
 				</repository>
 				<site>
-					<id>site</id>
+					<id>staging</id>
 					<url>dav:http://localhost:7070/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
 				</site>
 			</distributionManagement>