X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=78511d1510330c635809da4262f8652e01fae718;hb=b51cced6c9ca873af71831f4b4015cc8ecf56b91;hp=5bba9fa74fef688b4f51aa36dfb7c2dadd026355;hpb=681d41a73eee9696b30a3745ef3b0fd32a8c22e7;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 5bba9fa74..78511d151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>0.2.3-SNAPSHOT</version>
+		<version>0.3.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -12,22 +12,23 @@
 	<name>Argeo SLC</name>
 	<version>0.13.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle>0.13</developmentCycle>
+		<developmentCycle.slc>0.13</developmentCycle.slc>
 		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
+		<version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc>
 	</properties>
 	<modules>
 		<module>runtime</module>
 		<module>modules</module>
+<!-- 		<module>server</module> -->
 		<module>eclipse</module>
-		<module>server</module>
 		<module>demo</module>
 		<module>dep</module>
-		<module>integration-tests</module>
-		<!-- <module>archetypes</module> -->
+		<!-- FIXME: integration tests are currently failing -->
+		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
 	</modules>
-	<url>${site.urlBase}/${developmentCycle}</url>
+	<url>${site.urlBase}/${developmentCycle.slc}</url>
 	<scm>
 		<connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
 		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
@@ -39,9 +40,9 @@
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 			<comments><![CDATA[
-SLC - Software LifeCycle framework
+SLC (Software Life Cycle) framework
 			   
-Copyright 2010 Mathieu Baudier
+Copyright 2011 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.
@@ -72,9 +73,9 @@ limitations under the License.
 			</roles>
 		</developer>
 		<developer>
-			<id>cdujeu</id>
-			<name>Charles du Jeu</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=KGbI2aXhd2VnJuMU9cL3qeGeNSKwIeUjeqa3XCqRQhY=]]></email>
+			<id>ocapillo</id>
+			<name>Olivier Capillon</name>
+			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
 			<organization>Argeo</organization>
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
@@ -82,9 +83,9 @@ limitations under the License.
 			</roles>
 		</developer>
 		<developer>
-			<id>ocapillo</id>
-			<name>Olivier Capillon</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
+			<id>bsinou</id>
+			<name>Bruno Sinou</name>
+			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
 			<organization>Argeo</organization>
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
@@ -106,98 +107,118 @@ limitations under the License.
 	</contributors>
 	<dependencyManagement>
 		<dependencies>
+			<!-- FIXME : use distribution > v1.1.5 and remove this -->
+			<dependency>
+				<groupId>org.eclipse.core</groupId>
+				<artifactId>org.eclipse.core.databinding.observable</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.core</groupId>
+				<artifactId>org.eclipse.core.databinding.property</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+
+
+			<dependency>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions-all</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<!-- SLC (itself) -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.specs</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.core</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.unit</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.launcher</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.detached</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.lib.detached</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.simple</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ant</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.maven</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.hibernate</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.castor</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.activemq</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.jcr</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.server</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.osgi</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.equinox</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.jemmy</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.server</groupId>
 				<artifactId>org.argeo.slc.ria</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.argeo.ria</groupId>
 				<artifactId>org.argeo.ria.core</artifactId>
@@ -206,19 +227,17 @@ limitations under the License.
 			<dependency>
 				<groupId>org.argeo.slc.server</groupId>
 				<artifactId>deploy</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 				<type>pom</type>
 			</dependency>
-
 			<!-- SLC dubious -->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.detached.launcher</artifactId>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 				<type>tar.gz</type>
 				<classifier>dist</classifier>
 			</dependency>
-
 			<!-- Argeo Commons -->
 			<dependency>
 				<groupId>org.argeo.commons.security</groupId>
@@ -247,9 +266,9 @@ limitations under the License.
 				<artifactId>org.argeo.server.jackrabbit</artifactId>
 				<version>${version.argeo-commons}</version>
 			</dependency>
-
 		</dependencies>
 	</dependencyManagement>
+	<!-- -->
 	<repositories>
 		<repository>
 			<id>argeo</id>
@@ -284,7 +303,7 @@ limitations under the License.
 		<site>
 			<id>argeo-slc-site</id>
 			<name>SLC Site</name>
-			<url>file://${site.repoBase}/${developmentCycle}/</url>
+			<url>file://${site.repoBase}/${developmentCycle.slc}/</url>
 		</site>
 	</distributionManagement>
 	<reporting>
@@ -403,7 +422,7 @@ limitations under the License.
 				<site>
 					<id>argeo-slc-site</id>
 					<name>SLC Site</name>
-					<url>file://${site.repoBase}/${project.version}</url>
+					<url>file://${site.repoBase}/${version.slc}</url>
 				</site>
 			</distributionManagement>
 		</profile>