X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=dec5d2872f62ed2f6ee7bfc54394866a94b76676;hb=70f329fac0fd2170ecf455d77eb7ad2f0c6d0350;hp=4816463ac0c371ef5b1f5f1159ba0ab568cc7998;hpb=8ab3ba57cfe3c33bfbb9d0be8a91e5af443b5cd6;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 4816463ac..dec5d2872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,53 +2,47 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.argeo</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0</version>
+		<groupId>org.argeo.commons</groupId>
+		<artifactId>argeo-commons</artifactId>
+		<version>0.3.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.12.1-SNAPSHOT</version>
+	<version>0.13.1-SNAPSHOT</version>
+	<properties>
+		<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>dep</module>
 		<module>modules</module>
-		<module>server</module>
+<!-- 		<module>server</module> -->
+		<module>eclipse</module>
 		<module>demo</module>
-		<module>integration-tests</module>
-		<module>archetypes</module>
+		<module>dep</module>
+		<!-- FIXME: integration tests are currently failing -->
+		<!-- <module>integration-tests</module> -->
+		<module>dist</module>
 	</modules>
-	<properties>
-		<developmentCycle>0.12</developmentCycle>
-		<version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
-		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
-		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-		<version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>0.8.2.1</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>
-	</properties>
-	<url>${site.urlBase}/${developmentCycle}</url>
+	<url>${site.urlBase}/${developmentCycle.slc}</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>
-	</issueManagement>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
 			<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 2008 Mathieu Baudier - Argeo e.U.
+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.
@@ -65,10 +59,6 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<organization>
-		<name>Argeo</name>
-		<url>http://www.argeo.org</url>
-	</organization>
 	<developers>
 		<developer>
 			<id>mbaudier</id>
@@ -102,6 +92,17 @@ limitations under the License.
 				<role>developer</role>
 			</roles>
 		</developer>
+		<developer>
+			<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>
+				<role>developer</role>
+				<role>QA</role>
+			</roles>
+		</developer>
 	</developers>
 	<contributors>
 		<contributor>
@@ -120,24 +121,18 @@ limitations under the License.
 			<plugins>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
+					<artifactId>maven-scm-plugin</artifactId>
+					<version>1.4</version>
 					<configuration>
-						<source>1.5</source>
-						<target>1.5</target>
+						<connectionType>connection</connectionType>
 					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>attach-sources</id>
-							<phase>package</phase>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.scm</groupId>
+							<artifactId>maven-scm-provider-gitexe</artifactId>
+							<version>1.2</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
@@ -150,10 +145,10 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-3</version>
+				<version>1.0-beta-4</version>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>create</goal>
 						</goals>
@@ -162,173 +157,203 @@ limitations under the License.
 				<configuration>
 					<doCheck>false</doCheck>
 					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
+					<format>{0,date,yyyyMMdd_HHmmss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<revisionOnScmFailure>git</revisionOnScmFailure>
+					<providerImplementations>
+						<git>svn</git>
+					</providerImplementations>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.4.3</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-			<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
-				-->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy</goals>
+					<preparationGoals>clean install</preparationGoals>
 				</configuration>
 			</plugin>
 		</plugins>
-
 	</build>
 	<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>${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.server</artifactId>
-				<version>${project.version}</version>
+				<artifactId>org.argeo.slc.support.jcr</artifactId>
+				<version>${version.slc}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.osgiboot</artifactId>
-				<version>${project.version}</version>
+				<artifactId>org.argeo.slc.server</artifactId>
+				<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.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>
-				<version>${project.version}</version>
+				<version>${version.slc}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.argeo.ria</groupId>
 				<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>
-				<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.dep</groupId>
-				<artifactId>versions</artifactId>
-				<version>1.0.0</version>
+				<groupId>org.argeo.commons.security</groupId>
+				<artifactId>org.argeo.security.dep.ads</artifactId>
+				<version>${version.argeo-commons}</version>
 				<type>pom</type>
-				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.osgi</groupId>
+				<artifactId>org.argeo.osgi.boot</artifactId>
+				<version>${version.argeo-commons}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.ads</artifactId>
+				<version>${version.argeo-commons}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
+				<version>${version.argeo-commons}</version>
+				<type>pom</type>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.jackrabbit</artifactId>
+				<version>${version.argeo-commons}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+	<!-- -->
 	<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>
@@ -340,12 +365,26 @@ limitations under the License.
 				<checksumPolicy>fail</checksumPolicy>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>argeo-snapshots</id>
+			<url>http://dev.argeo.org/maven/argeo-snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
 	</repositories>
 	<distributionManagement>
 		<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>
@@ -353,6 +392,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.3.1</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -361,6 +401,7 @@ limitations under the License.
 							<report>license</report>
 							<report>scm</report>
 							<report>issue-tracking</report>
+							<report>dependencies</report>
 						</reports>
 					</reportSet>
 					<reportSet>
@@ -374,6 +415,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
@@ -383,6 +425,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.2</version>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
@@ -390,18 +433,16 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.7.1</version>
 				<inherited>false</inherited>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <groupId>org.codehaus.mojo</groupId>
-				<artifactId>scmchangelog-maven-plugin</artifactId> </plugin>
-			-->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.4</version>
 				<configuration>
 					<aggregate>true</aggregate>
 					<tags>
@@ -411,14 +452,10 @@ limitations under the License.
 					</tags>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <groupId>org.codehaus.mojo</groupId>
-				<artifactId>clirr-maven-plugin</artifactId>
-				<inherited>false</inherited> </plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.2</version>
 				<inherited>false</inherited>
 			</plugin>
 			<plugin>
@@ -466,7 +503,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>