X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=ea34cd896c199cb3f5d8d7c76f9442bb88e22f14;hb=bf943f312a0a44eccbbfc592be26291f63e63608;hp=6e4ace9b87b34427b936d281fe7772993511c34a;hpb=663c3b3bc3e618caedd5d2f202e1b508d7aa50a9;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 6e4ace9b8..ea34cd896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,9 @@
 	<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>
@@ -40,9 +38,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,16 +70,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 +88,6 @@ limitations under the License.
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
 				<role>developer</role>
-				<role>QA</role>
 			</roles>
 		</developer>
 	</developers>
@@ -116,91 +103,8 @@ limitations under the License.
 			</roles>
 		</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>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<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>
@@ -208,148 +112,8 @@ limitations under the License.
 				<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 +151,100 @@ 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>
+<!-- 	<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>