X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=489558edb909f790540f2e22407455aa7c32aa99;hb=3752a6c8a8a721276d2ecf60efab9dbab111d945;hp=75b2796360c0fd796a8fd2d00e774db965a81fea;hpb=ee8ca0dc4d8cb0bcf3345985522e4bbb8c9530bb;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 75b279636..489558edb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,19 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.12.1-SNAPSHOT</version>
+	<version>0.12.2-SNAPSHOT</version>
+	<properties>
+		<developmentCycle>0.13</developmentCycle>
+		<version.argeo-distribution>1.0.4</version.argeo-distribution>
+		<version.argeo-ria>0.12.4</version.argeo-ria>
+		<version.argeo-commons>0.2.0</version.argeo-commons>
+		<version.equinox>3.5.1.R35x_v20090827</version.equinox>
+		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
+		<version.maven-argeo-osgi>0.1.28</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>
+	</properties>
 	<modules>
 		<module>runtime</module>
 		<module>dep</module>
@@ -18,23 +30,14 @@
 		<module>server</module>
 		<module>demo</module>
 		<module>integration-tests</module>
-		<module>archetypes</module>
+		<!-- <module>archetypes</module>-->
+		<module>dist</module>
 	</modules>
-	<properties>
-		<developmentCycle>0.12</developmentCycle>
-		<version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
-		<version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
-		<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.22</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>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/slc/trunk</developerConnection>
+		<developerConnection>scm:svn:https://www.argeo.org/svn/slc/trunk
+		</developerConnection>
 		<url>https://www.argeo.org/svn/slc/trunk</url>
 	</scm>
 	<issueManagement>
@@ -49,7 +52,7 @@
 			<comments><![CDATA[
 SLC - Software LifeCycle framework
 			   
-Copyright 2008 Mathieu Baudier - Argeo e.U.
+Copyright 2010 Mathieu Baudier - Argeo SASU.
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -151,7 +154,6 @@ limitations under the License.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-3</version>
 				<executions>
 					<execution>
 						<phase>validate</phase>
@@ -189,13 +191,52 @@ limitations under the License.
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
 					<goals>deploy</goals>
+					<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>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 
 	</build>
 	<dependencyManagement>
 		<dependencies>
+			<!-- Third Parties -->
+			<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>
@@ -237,6 +278,11 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.ant</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.maven</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -254,12 +300,12 @@ limitations under the License.
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.server</artifactId>
+				<artifactId>org.argeo.slc.support.jcr</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.osgiboot</artifactId>
+				<artifactId>org.argeo.slc.server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
@@ -329,15 +375,23 @@ limitations under the License.
 				<artifactId>org.argeo.osgi.boot</artifactId>
 				<version>${version.argeo-commons}</version>
 			</dependency>
-
-			<!-- Third Parties -->
 			<dependency>
-				<groupId>org.argeo.dep</groupId>
-				<artifactId>versions</artifactId>
-				<version>1.0.1-SNAPSHOT</version>
+				<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>
-				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.jackrabbit</artifactId>
+				<version>${version.argeo-commons}</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
@@ -410,10 +464,6 @@ limitations under the License.
 					<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>
@@ -426,11 +476,6 @@ 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>