X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=64c3d592b5b1be4c4ad43e0ea9d6e691c854ef93;hb=ad42a84b78e26be716e2bf42ef1b7208bc021a7d;hp=afb0873f91242a9de423ebf958829dae1700fe5f;hpb=687cbec52340eca1a829e6a69355cd379373c9d5;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index afb0873f9..64c3d592b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,30 +1,28 @@
-<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.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>0.3.4-SNAPSHOT</version>
+		<version>0.4.0</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.13.1-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle.slc>0.13</developmentCycle.slc>
+		<developmentCycle.slc>0.14</developmentCycle.slc>
+		<developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
 		<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>
+		<version.slc>${developmentCycle.slc}.2</version.slc>
 	</properties>
 	<modules>
 		<module>runtime</module>
 		<module>modules</module>
-<!-- 		<module>server</module> -->
 		<module>eclipse</module>
 		<module>demo</module>
 		<module>dep</module>
-		<!-- FIXME: integration tests are currently failing -->
 		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
 	</modules>
@@ -34,15 +32,16 @@
 		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
 		<url>https://svn.argeo.org/slc/trunk</url>
 	</scm>
+	<inceptionYear>2007</inceptionYear>
 	<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 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,16 +71,6 @@ limitations under the License.
 				<role>QA</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>cdujeu</id>
-			<name>Charles du Jeu</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=KGbI2aXhd2VnJuMU9cL3qeGeNSKwIeUjeqa3XCqRQhY=]]></email>
-			<organization>Argeo</organization>
-			<organizationUrl>http://www.argeo.org</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
 		<developer>
 			<id>ocapillo</id>
 			<name>Olivier Capillon</name>
@@ -100,7 +89,6 @@ limitations under the License.
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
 				<role>developer</role>
-				<role>QA</role>
 			</roles>
 		</developer>
 	</developers>
@@ -117,239 +105,16 @@ limitations under the License.
 		</contributor>
 	</contributors>
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.4</version>
-					<configuration>
-						<connectionType>connection</connectionType>
-					</configuration>
-					<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>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>${version.maven-argeo-osgi}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<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-release-plugin</artifactId>
-				<version>2.1</version>
+				<artifactId>maven-site-plugin</artifactId>
+				<inherited>false</inherited>
 				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<preparationGoals>clean install</preparationGoals>
+					<skip>false</skip>
 				</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>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.core</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.unit</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.launcher</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.detached</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.lib.detached</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.simple</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.ant</artifactId>
-				<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>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.castor</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.activemq</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.jcr</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<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>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.equinox</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.jemmy</artifactId>
-				<version>${version.slc}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.server</groupId>
-				<artifactId>org.argeo.slc.ria</artifactId>
-				<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>deploy</artifactId>
-				<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>${version.slc}</version>
-				<type>tar.gz</type>
-				<classifier>dist</classifier>
-			</dependency>
-			<!-- Argeo Commons -->
-			<dependency>
-				<groupId>org.argeo.commons.security</groupId>
-				<artifactId>org.argeo.security.dep.ads</artifactId>
-				<version>${version.argeo-commons}</version>
-				<type>pom</type>
-			</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>
@@ -387,100 +152,6 @@ limitations under the License.
 			<url>file://${site.repoBase}/${developmentCycle.slc}/</url>
 		</site>
 	</distributionManagement>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.3.1</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>summary</report>
-							<report>license</report>
-							<report>scm</report>
-							<report>issue-tracking</report>
-							<report>dependencies</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<inherited>false</inherited>
-						<reports>
-							<report>project-team</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.7</version>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<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>taglist-maven-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<aggregate>true</aggregate>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-						<tag>@deprecated</tag>
-					</tags>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changelog-plugin</artifactId>
-				<version>2.2</version>
-				<inherited>false</inherited>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.3</version>
-				<inherited>false</inherited>
-				<configuration>
-					<linkXref>true</linkXref>
-					<targetJdk>1.5</targetJdk>
-					<aggregate>true</aggregate>
-					<excludes>
-						<exclude>**/springutil/*.java</exclude>
-					</excludes>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>cpd</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
 	<profiles>
 		<profile>
 			<id>developer</id>