X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=afb0873f91242a9de423ebf958829dae1700fe5f;hb=4663b42433ba4a16c81d90927aecff2a923cd7a4;hp=d0ca4baad431298b97d1a643f35f6f27d65a3965;hpb=d3f61d35ac7ed626fbc19d4fac32e7e48b40de5b;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index d0ca4baad..afb0873f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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.2.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>
@@ -11,38 +12,28 @@
 	<name>Argeo SLC</name>
 	<version>0.13.1-SNAPSHOT</version>
 	<properties>
-		<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.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>
+		<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>
 		<url>https://svn.argeo.org/slc/trunk</url>
 	</scm>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://bugzilla.argeo.org</url>
-	</issueManagement>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -68,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>
@@ -105,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>
@@ -123,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>
@@ -153,9 +145,10 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
 				<executions>
 					<execution>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>create</goal>
 						</goals>
@@ -164,58 +157,50 @@ 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.1.1</version>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>release</releaseProfiles>
 					<preparationGoals>clean install</preparationGoals>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>com.mycila.maven-license-plugin</groupId>
-				<artifactId>maven-license-plugin</artifactId>
-				<configuration>
-					<header>license-apache2-header.txt</header>
-					<failIfMissing>true</failIfMissing>
-					<aggregate>true</aggregate>
-					<includes>
-						<include>src/**/*.java</include>
-						<include>src/**/*.xml</include>
-					</includes>
-					<excludes>
-						<exclude>**/springutil/**</exclude>
-						<exclude>**/qooxdoo-sdk/**</exclude>
-					</excludes>
-					<useDefaultExcludes>true</useDefaultExcludes>
-					<mapping>
-						<java>SLASHSTAR_STYLE</java>
-						<xml>XML_STYLE</xml>
-					</mapping>
-				</configuration>
-			</plugin>
 		</plugins>
-
 	</build>
 	<dependencyManagement>
 		<dependencies>
-			<!-- Third Parties -->
+			<!-- 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>
@@ -228,94 +213,93 @@ limitations under the License.
 			<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>
@@ -324,19 +308,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>
@@ -365,9 +347,9 @@ limitations under the License.
 				<artifactId>org.argeo.server.jackrabbit</artifactId>
 				<version>${version.argeo-commons}</version>
 			</dependency>
-
 		</dependencies>
 	</dependencyManagement>
+	<!-- -->
 	<repositories>
 		<repository>
 			<id>argeo</id>
@@ -383,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>
@@ -396,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>
@@ -404,6 +401,7 @@ limitations under the License.
 							<report>license</report>
 							<report>scm</report>
 							<report>issue-tracking</report>
+							<report>dependencies</report>
 						</reports>
 					</reportSet>
 					<reportSet>
@@ -417,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>
@@ -426,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>
@@ -433,6 +433,7 @@ 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>
@@ -441,6 +442,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.4</version>
 				<configuration>
 					<aggregate>true</aggregate>
 					<tags>
@@ -453,6 +455,7 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.2</version>
 				<inherited>false</inherited>
 			</plugin>
 			<plugin>
@@ -500,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>