X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=b12659b2db55641c6f7ddb360e2b9cd0931073d7;hb=dddbccb13ea466d1e3d193d4a84928e9534b8c23;hp=0d22a4c4a462191d03cd85d85e54bf6d28bb2268;hpb=465645defedd08dcdf1cc066c5bdc2e14dc9da9b;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 0d22a4c4a..b12659b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,21 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.51-SNAPSHOT</version>
+		<version>2.1.70-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.6-SNAPSHOT</version>
+	<version>2.1.10-SNAPSHOT</version>
 	<properties>
 		<developmentCycle.slc>2.1</developmentCycle.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-		<version.argeo-rcp>2.1.12-SNAPSHOT</version.argeo-rcp>
-		<version.slc>2.1.6-SNAPSHOT</version.slc>
+		<version.argeo-rcp>2.1.15</version.argeo-rcp>
+		<version.slc>2.1.10-SNAPSHOT</version.slc>
+		<version.equinox>3.11.1.v20160708-1632</version.equinox>
+		<!-- Embedded Maven -->
+		<version.maven>3.2.5</version.maven>
 	</properties>
 	<modules>
 		<!-- Runtime -->
@@ -22,8 +25,10 @@
 		<module>org.argeo.slc.core</module>
 		<module>org.argeo.slc.unit</module>
 		<module>org.argeo.slc.support</module>
+		<module>org.argeo.slc.support.maven</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
+		<module>org.argeo.slc.launcher</module>
 
 		<!-- Modules -->
 		<module>org.argeo.slc.agent</module>
@@ -34,7 +39,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>org.argeo.slc.client.rcp</module> -->
 
 		<module>lib</module>
 		<module>dep</module>
@@ -43,9 +48,10 @@
 	</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>
+		<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>HEAD</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -116,12 +122,18 @@ limitations under the License.
 					<skip>false</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -130,14 +142,14 @@ limitations under the License.
 		</repository>
 		<repository>
 			<id>argeo-rcp</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-rcp-2.1</url>
+			<url>http://forge.argeo.org/data/java/argeo-rcp-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-		
+
 		<!-- Disable Maven default repository -->
 		<repository>
 			<id>central</id>
@@ -156,7 +168,7 @@ limitations under the License.
 			<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>
@@ -165,7 +177,7 @@ limitations under the License.
 				</repository>
 				<!-- <repository> -->
 				<!-- <id>argeo-tp-extras</id> -->
-				<!-- <url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url> -->
+				<!-- <url>http://localhost:7080/data/java/argeo-tp-extras-2.1</url> -->
 				<!-- <releases> -->
 				<!-- <enabled>true</enabled> -->
 				<!-- <updatePolicy>daily</updatePolicy> -->
@@ -174,7 +186,7 @@ limitations under the License.
 				<!-- </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>
@@ -185,11 +197,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>