X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=78511d1510330c635809da4262f8652e01fae718;hb=b51cced6c9ca873af71831f4b4015cc8ecf56b91;hp=acc7babcbb616438cd2771fdef4732ac2bc6d83e;hpb=db59a5946d2d0196c31edadc9612094c1136121d;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index acc7babcb..78511d151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,58 +1,48 @@
 <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>
+	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.11.4-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.11</developmentCycle>
-		<version.argeo-ria>0.11.4-SNAPSHOT</version.argeo-ria>
-		<version.spring>2.5.6.SEC01</version.spring>
-		<version.spring-ws>1.5.7.A</version.spring-ws>
-		<version.spring-osgi>1.2.0</version.spring-osgi>
-		<version.maven>2.0.9</version.maven>
-		<version.ant>1.7.0</version.ant>
-		<version.jetty>6.1.14</version.jetty>
-		<version.tomcat>6.0.18</version.tomcat>
-		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
-		<version.slf4j>1.5.6</version.slf4j>
-		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-		<version.activemq>5.2.0.0006</version.activemq>
-		<version.maven-argeo-osgi>0.1.15-SNAPSHOT</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>0.8.1.7</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.
@@ -69,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>
@@ -87,9 +73,9 @@ limitations under the License.
 			</roles>
 		</developer>
 		<developer>
-			<id>cdujeu</id>
-			<name>Charles du Jeu</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=KGbI2aXhd2VnJuMU9cL3qeGeNSKwIeUjeqa3XCqRQhY=]]></email>
+			<id>ocapillo</id>
+			<name>Olivier Capillon</name>
+			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
 			<organization>Argeo</organization>
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
@@ -97,9 +83,9 @@ limitations under the License.
 			</roles>
 		</developer>
 		<developer>
-			<id>ocapillo</id>
-			<name>Olivier Capillon</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
+			<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>
@@ -119,796 +105,174 @@ limitations under the License.
 			</roles>
 		</contributor>
 	</contributors>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.5</source>
-						<target>1.5</target>
-					</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>
-				</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-3</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<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>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy,site-deploy</goals>
-				</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>${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>${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>
-
-
-			<!-- Javax -->
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>
-					com.springsource.javax.transaction
-				</artifactId>
-				<version>1.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.xml.stream</groupId>
-				<artifactId>
-					com.springsource.javax.xml.stream
-				</artifactId>
-				<version>1.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.xml.soap</groupId>
-				<artifactId>com.springsource.javax.xml.soap</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.xml</groupId>
-				<artifactId>
-					com.springsource.com.sun.xml.messaging.saaj
-				</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>
-					com.springsource.javax.activation
-				</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.annotation</groupId>
-				<artifactId>com.springsource.javax.annotation</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.persistence</groupId>
-				<artifactId>com.springsource.javax.persistence</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.xml.ws</groupId>
-				<artifactId>com.springsource.javax.xml.ws</artifactId>
-				<version>2.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>com.springsource.javax.xml.bind</artifactId>
-				<version>2.1.7</version>
-			</dependency>
-
-			<!-- Unit tests -->
-			<dependency>
-				<groupId>org.junit</groupId>
-				<artifactId>com.springsource.junit</artifactId>
-				<version>3.8.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.dbunit</groupId>
-				<artifactId>com.springsource.org.dbunit</artifactId>
-				<version>2.2.0</version>
-			</dependency>
-
-			<!-- Logging -->
-			<dependency>
-				<groupId>org.apache.log4j</groupId>
-				<artifactId>
-					com.springsource.org.apache.log4j
-				</artifactId>
-				<version>1.2.15</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>
-					com.springsource.org.apache.commons.logging
-				</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-				<version>${version.slf4j}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>com.springsource.slf4j.jcl</artifactId>
-				<version>${version.slf4j}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
-				<version>${version.slf4j}</version>
-			</dependency>
-
-			<!-- Spring -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.core</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.beans</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.context</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>
-					org.springframework.context.support
-				</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.orm</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.jdbc</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.transaction</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.web</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.web.servlet</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.aop</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.jms</artifactId>
-				<version>${version.spring}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.ws</groupId>
-				<artifactId>org.springframework.oxm</artifactId>
-				<version>${version.spring-ws}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.springframework.osgi</groupId>
-				<artifactId>org.springframework.osgi.extender</artifactId>
-				<version>${version.spring-osgi}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.osgi</groupId>
-				<artifactId>org.springframework.osgi.core</artifactId>
-				<version>${version.spring-osgi}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.osgi</groupId>
-				<artifactId>org.springframework.osgi.web.extender</artifactId>
-				<version>${version.spring-osgi}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.osgi</groupId>
-				<artifactId>org.springframework.osgi.web</artifactId>
-				<version>${version.spring-osgi}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.osgi</groupId>
-				<artifactId>org.springframework.osgi.test</artifactId>
-				<version>${version.spring-osgi}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-				<version>1.0.0.argeo4</version>
-			</dependency>
-
-			<!-- AOP -->
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>com.springsource.org.aspectj.runtime</artifactId>
-				<version>1.6.3.RELEASE</version>
-			</dependency>
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
-				<version>1.6.3.RELEASE</version>
-			</dependency>
-			<dependency>
-				<groupId>org.aopalliance</groupId>
-				<artifactId>com.springsource.org.aopalliance</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.cglib</groupId>
-				<artifactId>com.springsource.net.sf.cglib</artifactId>
-				<version>2.1.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.objectweb.asm</groupId>
-				<artifactId>com.springsource.org.objectweb.asm</artifactId>
-				<version>1.5.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.objectweb.asm</groupId>
-				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-				<version>1.5.3</version>
-			</dependency>
-
-			<!-- Ant -->
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>com.springsource.org.apache.tools.ant</artifactId>
-				<version>1.7.1</version>
-			</dependency>
-
-			<!-- Required by specific Ant tasks -->
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.net</artifactId>
-				<version>1.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.oro</groupId>
-				<artifactId>com.springsource.org.apache.oro</artifactId>
-				<version>2.0.8</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.bsf</groupId>
-				<artifactId>com.springsource.org.apache.bsf</artifactId>
-				<version>2.4.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.beanshell</groupId>
-				<artifactId>com.springsource.bsh</artifactId>
-				<version>2.0.0.b4</version>
-			</dependency>
-
-			<!-- Apache Commons -->
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>
-					com.springsource.org.apache.commons.io
-				</artifactId>
-				<version>1.4.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.collections</artifactId>
-				<version>3.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
-				<version>1.1.0.argeo1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
-				<version>1.0.0.argeo1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.pool</artifactId>
-				<version>1.4.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
-				<version>1.2.2.osgi</version>
-			</dependency>
-
-			<!-- DB Drivers -->
-			<dependency>
-				<groupId>org.hsqldb</groupId>
-				<artifactId>com.springsource.org.hsqldb</artifactId>
-				<version>1.8.0.9</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.jtds</groupId>
-				<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
-				<version>1.2.2</version>
-			</dependency>
-			<dependency>
-				<groupId>com.mysql.jdbc</groupId>
-				<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-				<version>5.1.6</version>
-			</dependency>
-
-			<!-- XML -->
-			<dependency>
-				<groupId>org.codehaus.castor</groupId>
-				<artifactId>com.springsource.org.castor</artifactId>
-				<version>1.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.xerces</groupId>
-				<artifactId>
-					com.springsource.org.apache.xerces
-				</artifactId>
-				<version>2.8.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.xalan</groupId>
-				<artifactId>
-					com.springsource.org.apache.xalan
-				</artifactId>
-				<version>2.7.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.xmlcommons</groupId>
-				<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-				<version>1.3.3</version>
-			</dependency>
-
-			<!-- Web -->
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>com.springsource.javax.servlet</artifactId>
-				<version>2.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>com.springsource.javax.servlet.jsp</artifactId>
-				<version>2.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.el</groupId>
-				<artifactId>com.springsource.javax.el</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>
-					com.springsource.javax.servlet.jsp.jstl
-				</artifactId>
-				<version>1.1.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.taglibs</groupId>
-				<artifactId>
-					com.springsource.org.apache.taglibs.standard
-				</artifactId>
-				<version>1.1.2</version>
-			</dependency>
+			<!-- Argeo Commons -->
 			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>com.springsource.javax.activation</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.lowagie.text</groupId>
-				<artifactId>
-					com.springsource.com.lowagie.text
-				</artifactId>
-				<version>2.0.8</version>
-			</dependency>
-
-			<!-- Tomcat -->
-			<dependency>
-				<groupId>org.apache.catalina</groupId>
-				<artifactId>com.springsource.org.apache.catalina</artifactId>
-				<version>${version.tomcat}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.jasper</groupId>
-				<artifactId>com.springsource.org.apache.jasper</artifactId>
-				<version>${version.tomcat}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.el</groupId>
-				<artifactId>com.springsource.org.apache.el</artifactId>
-				<version>${version.tomcat}</version>
-			</dependency>
-
-			<!-- Maven -->
-			<dependency>
-				<groupId>org.apache.maven</groupId>
-				<artifactId>maven-core</artifactId>
-				<version>${version.maven}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.maven</groupId>
-				<artifactId>maven-embedder</artifactId>
-				<!-- no higher version available -->
-				<version>2.0.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.maven</groupId>
-				<artifactId>maven-settings</artifactId>
-				<version>${version.maven}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.archiva</groupId>
-				<artifactId>archiva-webapp</artifactId>
-				<version>1.1.3</version>
-				<type>war</type>
-			</dependency>
-
-			<!-- OSGi -->
-			<dependency>
-				<groupId>org.eclipse.osgi</groupId>
-				<artifactId>org.eclipse.osgi</artifactId>
-				<version>${version.equinox}</version>
-			</dependency>
-
-			<!-- Auto UI -->
-			<dependency>
-				<groupId>org.argeo.dep.jemmy</groupId>
-				<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
-				<version>0.2.2</version>
-			</dependency>
-
-			<!-- Spring bundle repo -->
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>
-					com.springsource.javax.transaction
-				</artifactId>
-				<version>1.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>com.springsource.org.hibernate</artifactId>
-				<version>3.2.6.ga</version>
-				<!-- <version>3.3.1.GA</version> TODO: fix issues with logging -->
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.jexcelapi</groupId>
-				<artifactId>com.springsource.jxl</artifactId>
-				<version>2.6.6</version>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.ehcache</groupId>
-				<artifactId>com.springsource.net.sf.ehcache</artifactId>
-				<version>1.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>edu.emory.mathcs.backport</groupId>
-				<artifactId>
-					com.springsource.edu.emory.mathcs.backport
-				</artifactId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.wsdl</groupId>
-				<artifactId>com.springsource.javax.wsdl</artifactId>
-				<version>1.6.1</version>
-			</dependency>
-
-			<!-- JMS -->
-			<dependency>
-				<groupId>javax.jms</groupId>
-				<artifactId>com.springsource.javax.jms</artifactId>
-				<version>1.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>com.springsource.javax.management.j2ee</artifactId>
-				<version>1.0.1</version>
-			</dependency>
-
-			<!-- ActiveMQ -->
-			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.activemq</artifactId>
-				<version>${version.activemq}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
-				<version>5.2.0</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.activemq</groupId>
-						<artifactId>com.springsource.org.apache.activemq</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<!--
-				<dependency> <groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-				<version>${version.activemq-web}</version> </dependency>
-			-->
-			<dependency>
-				<groupId>javax.xml.soap</groupId>
-				<artifactId>com.springsource.javax.xml.soap</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.xml.rpc</groupId>
-				<artifactId>com.springsource.javax.xml.rpc</artifactId>
-				<version>1.1.0</version>
+				<groupId>org.argeo.commons.security</groupId>
+				<artifactId>org.argeo.security.dep.ads</artifactId>
+				<version>${version.argeo-commons}</version>
+				<type>pom</type>
 			</dependency>
 			<dependency>
-				<groupId>javax.ejb</groupId>
-				<artifactId>com.springsource.javax.ejb</artifactId>
-				<version>3.0.0</version>
+				<groupId>org.argeo.commons.osgi</groupId>
+				<artifactId>org.argeo.osgi.boot</artifactId>
+				<version>${version.argeo-commons}</version>
 			</dependency>
-
 			<dependency>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>com.springsource.org.apache.camel</artifactId>
-				<version>1.3.0</version>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.ads</artifactId>
+				<version>${version.argeo-commons}</version>
 			</dependency>
-
-			<!-- SSH -->
 			<dependency>
-				<groupId>com.jcraft.jsch</groupId>
-				<artifactId>com.springsource.com.jcraft.jsch</artifactId>
-				<version>0.1.25</version>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
+				<version>${version.argeo-commons}</version>
+				<type>pom</type>
 			</dependency>
-
-			<!-- Scheduling -->
 			<dependency>
-				<groupId>com.opensymphony.quartz</groupId>
-				<artifactId>com.springsource.org.quartz</artifactId>
-				<version>1.6.2</version>
+				<groupId>org.argeo.commons.server</groupId>
+				<artifactId>org.argeo.server.jackrabbit</artifactId>
+				<version>${version.argeo-commons}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+	<!-- -->
 	<repositories>
-		<repository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.release</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - SpringSource
-				Bundle
-				Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/release
-			</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - External
-				Bundle
-				Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/external
-			</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
 		<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>
@@ -922,7 +286,7 @@ limitations under the License.
 		</repository>
 		<repository>
 			<id>argeo-snapshots</id>
-			<url>http://www.argeo.org/maven/argeo-snapshots</url>
+			<url>http://dev.argeo.org/maven/argeo-snapshots</url>
 			<releases>
 				<enabled>false</enabled>
 				<updatePolicy>never</updatePolicy>
@@ -935,53 +299,11 @@ limitations under the License.
 			</snapshots>
 		</repository>
 	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>argeo</id>
-			<url>http://www.argeo.org/maven/argeo</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>argeo-snapshots</id>
-			<url>http://www.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>
-		</pluginRepository>
-	</pluginRepositories>
 	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>file:///var/argeo/maven2/argeo</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>true</uniqueVersion>
-			<id>argeo-snapshots-restricted</id>
-			<name>Argeo FOSS Snapshots Repository</name>
-			<url>file:///var/argeo/maven2/argeo-snapshots</url>
-		</snapshotRepository>
 		<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>
@@ -989,6 +311,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>
@@ -997,6 +320,7 @@ limitations under the License.
 							<report>license</report>
 							<report>scm</report>
 							<report>issue-tracking</report>
+							<report>dependencies</report>
 						</reports>
 					</reportSet>
 					<reportSet>
@@ -1010,14 +334,17 @@ 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>
+					<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>
@@ -1025,18 +352,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>
@@ -1046,14 +371,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>
@@ -1101,7 +422,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>