X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=495faedcc9a0bcae7db3d44b2699709edd81b14e;hb=eafbb773311edce4044f5a6cbe6d3b343adbd98d;hp=bef29ce63a5490c4be294e1a475a9f79da02f542;hpb=6db6d527ad939b68aadc77bf2171a94f10141802;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index bef29ce63..495faedcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,19 +3,18 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.39</version>
+		<version>2.1.55</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.3-SNAPSHOT</version>
+	<version>2.1.7</version>
 	<properties>
 		<developmentCycle.slc>2.1</developmentCycle.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-		<version.slc>2.1.3-SNAPSHOT</version.slc>
-		<!-- Libraries versions -->
-		<version.argeo-tp-extras>2.1.7</version.argeo-tp-extras>
+<!-- 		<version.argeo-rcp>2.1.14-SNAPSHOT</version.argeo-rcp> -->
+		<version.slc>2.1.7</version.slc>
 	</properties>
 	<modules>
 		<!-- Runtime -->
@@ -28,7 +27,6 @@
 
 		<!-- 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>
 
@@ -36,6 +34,7 @@
 		<module>org.argeo.slc.client.ui</module>
 		<module>org.argeo.slc.client.ui.dist</module>
 		<module>org.argeo.slc.client.rap</module>
+<!-- 		<module>org.argeo.slc.client.rcp</module> -->
 
 		<module>lib</module>
 		<module>dep</module>
@@ -44,10 +43,11 @@
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
-		<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>
+		<connection>scm:git:http://git.argeo.org/apache2/argeo-slc.git</connection>
+		<url>http://git.argeo.org/?p=apache2/argeo-slc.git;a=summary</url>
+		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-slc.git</developerConnection>
+	  <tag>argeo-slc-2.1.7</tag>
+  </scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
@@ -121,8 +121,8 @@ 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/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -130,70 +130,52 @@ limitations under the License.
 			</releases>
 		</repository>
 		<repository>
-			<id>argeo-tp-extras</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
+			<id>argeo-rcp</id>
+			<url>http://forge.argeo.org/data/java/argeo-rcp-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<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>
+		
+		<!-- Disable Maven default repository -->
 		<repository>
-			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/argeo-slc-${developmentCycle.slc}</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>site</id>
-			<url>dav:https://repo.argeo.org/data/files/docs/argeo-slc-${developmentCycle.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>
+					<url>http://localhost:7070/data/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/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>
+					<url>http://localhost:7070/data/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -204,11 +186,11 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/java/argeo-slc-${developmentCycle.slc}</url>
+					<url>dav:http://localhost:7070/data/java/argeo-slc-${developmentCycle.slc}</url>
 				</repository>
 				<site>
 					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
+					<url>dav:http://localhost:7070/data/docs/argeo-slc-${developmentCycle.slc}</url>
 				</site>
 			</distributionManagement>
 		</profile>