X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=81e44407d44b76a861feffa94bd8a33297897458;hb=62c0ae0f39243079b47639961b012ed946c756a8;hp=e9a65079ce2ff3642540563d975c8b8b60495ec0;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index e9a65079c..81e44407d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,45 +4,45 @@
 	<parent>
 		<groupId>org.argeo</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0</version>
+		<version>1.2.0</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.12.2-SNAPSHOT</version>
+	<version>0.13.0-SNAPSHOT</version>
 	<properties>
-		<developmentCycle>0.12</developmentCycle>
-		<version.argeo-distribution>1.0.4-SNAPSHOT</version.argeo-distribution>
-		<version.argeo-ria>0.12.4-SNAPSHOT</version.argeo-ria>
-		<version.argeo-commons>0.1.3-SNAPSHOT</version.argeo-commons>
-		<version.equinox>3.5.1.R35x_v20090827</version.equinox>
+		<developmentCycle>0.13</developmentCycle>
+		<version.argeo-distribution>1.1.0</version.argeo-distribution>
+		<version.argeo-ria>0.12.5</version.argeo-ria>
+		<version.argeo-commons>0.2.1</version.argeo-commons>
+		<version.equinox>3.6.1</version.equinox>
 		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-		<version.maven-argeo-osgi>0.1.28-SNAPSHOT</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>0.8.3.0</version.maven-argeo-qooxdoo>
-		<site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
-		<site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
+		<version.maven-argeo-osgi>0.1.29</version.maven-argeo-osgi>
+		<version.maven-argeo-qooxdoo>1.1.0</version.maven-argeo-qooxdoo>
+		<site.repoBase>file:///srv/projects/www/site</site.repoBase>
+		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
 	</properties>
 	<modules>
 		<module>runtime</module>
-		<module>dep</module>
 		<module>modules</module>
+		<module>eclipse</module>
 		<module>server</module>
 		<module>demo</module>
+		<module>dep</module>
 		<module>integration-tests</module>
-		<!-- <module>archetypes</module>-->
+		<!-- <module>archetypes</module> -->
 		<module>dist</module>
 	</modules>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/slc/trunk
-		</developerConnection>
-		<url>https://www.argeo.org/svn/slc/trunk</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>
 	<issueManagement>
 		<system>Bugzilla</system>
-		<url>https://www.argeo.org/bugzilla/</url>
+		<url>https://bugzilla.argeo.org</url>
 	</issueManagement>
 	<licenses>
 		<license>
@@ -52,7 +52,7 @@
 			<comments><![CDATA[
 SLC - Software LifeCycle framework
 			   
-Copyright 2010 Mathieu Baudier - Argeo SASU.
+Copyright 2010 Mathieu Baudier
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -178,11 +178,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>2.0-beta-5</version>
-				<!--
-					The site plugin is buggy with multi modules.
-					http://jira.codehaus.org/browse/MSITE-276
-				-->
+				<version>2.1.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -190,9 +186,7 @@ limitations under the License.
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy</goals>
-					<preparationGoals>clean argeo-osgi:update-manifests install
-					</preparationGoals>
+					<preparationGoals>clean install</preparationGoals>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -216,13 +210,6 @@ limitations under the License.
 						<xml>XML_STYLE</xml>
 					</mapping>
 				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 
@@ -324,14 +311,6 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.jemmy</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<!--
-				<dependency> <groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.ws.client</artifactId>
-				<version>${project.version}</version> </dependency> <dependency>
-				<groupId>org.argeo.slc</groupId>
-				<artifactId>org.argeo.slc.webapp</artifactId>
-				<version>${project.version}</version> <type>war</type> </dependency>
-			-->
 			<dependency>
 				<groupId>org.argeo.slc.server</groupId>
 				<artifactId>org.argeo.slc.ria</artifactId>
@@ -343,11 +322,6 @@ limitations under the License.
 				<artifactId>org.argeo.ria.core</artifactId>
 				<version>${version.argeo-ria}</version>
 			</dependency>
-			<!--
-				<dependency> <groupId>org.argeo.slc.server</groupId>
-				<artifactId>bundles</artifactId> <version>0.11.3-SNAPSHOT</version>
-				<type>pom</type> </dependency>
-			-->
 			<dependency>
 				<groupId>org.argeo.slc.server</groupId>
 				<artifactId>deploy</artifactId>
@@ -398,7 +372,7 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://www.argeo.org/maven/argeo</url>
+			<url>http://maven.argeo.org/argeo</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>