]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - pom.xml
[maven-release-plugin] copy for tag argeo-slc-0.12.0
[gpl/argeo-slc.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 98fde70983cf9bd0af92a2d839de55f42e217bc8..e5c36e42fe9cbd2aca094fe80fba6d3381347c94 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,22 @@
-<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>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>0.11.4-SNAPSHOT</version>
+       <version>0.12.0</version>
        <modules>
                <module>runtime</module>
                <module>dep</module>
+               <module>modules</module>
                <module>server</module>
                <module>demo</module>
                <module>integration-tests</module>
                <module>archetypes</module>
        </modules>
        <properties>
-               <developmentCycle>0.11</developmentCycle>
+               <developmentCycle>0.12</developmentCycle>
+               <version.argeo-ria>0.12.0</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.tomcat>6.0.18</version.tomcat>
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <version.slf4j>1.5.6</version.slf4j>
+               <version.asm>2.2.3</version.asm>
                <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.13</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.21</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>
-               <url>https://www.argeo.org/svn/slc/trunk</url>
+               <connection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-0.12.0</connection>
+               <developerConnection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-0.12.0</developerConnection>
+               <url>https://www.argeo.org/svn/slc/tags/argeo-slc-0.12.0</url>
        </scm>
        <issueManagement>
                <system>Bugzilla</system>
@@ -140,70 +143,32 @@ limitations under the License.
                                                </execution>
                                        </executions>
                                </plugin>
-                               <!--
-                                       <plugin> <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId> <executions>
-                                       <execution> <id>attach-javadoc</id> <phase>package</phase> <goals>
-                                       <goal>jar</goal> </goals> </execution> </executions> </plugin>
-                               -->
-                               <plugin>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>maven-jetty-plugin</artifactId>
-                                       <version>${version.jetty}</version>
-                                       <configuration>
-                                               <contextPath>org.argeo.slc.webapp</contextPath>
-                                               <stopKey>stopKey</stopKey>
-                                               <stopPort>9091</stopPort>
-                                               <connectors>
-                                                       <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                                                               <port>9090</port>
-                                                               <maxIdleTime>60000</maxIdleTime>
-                                                       </connector>
-                                               </connectors>
-                                       </configuration>
-                                       <dependencies>
-                                               <dependency>
-                                                       <groupId>org.hsqldb</groupId>
-                                                       <artifactId>
-                                                               com.springsource.org.hsqldb
-                                                       </artifactId>
-                                                       <version>1.8.0.9</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.mortbay.jetty</groupId>
-                                                       <artifactId>jetty-plus</artifactId>
-                                                       <version>${version.jetty}</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.mortbay.jetty</groupId>
-                                                       <artifactId>jetty-naming</artifactId>
-                                                       <version>${version.jetty}</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.apache.log4j</groupId>
-                                                       <artifactId>com.springsource.org.apache.log4j</artifactId>
-                                                       <version>1.2.15</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>javax.xml.soap</groupId>
-                                                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-                                                       <version>1.3.0</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>javax.mail</groupId>
-                                                       <artifactId>com.springsource.javax.mail</artifactId>
-                                                       <version>1.4.1</version>
-                                               </dependency>
-                                       </dependencies>
-                               </plugin>
                                <plugin>
-                                       <groupId>org.argeo.slc.maven</groupId>
+                                       <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>
@@ -220,15 +185,13 @@ limitations under the License.
                                        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>
+                                       <goals>deploy</goals>
                                </configuration>
                        </plugin>
                </plugins>
@@ -242,6 +205,16 @@ limitations under the License.
                                <artifactId>org.argeo.slc.specs</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.core</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.unit</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.launcher</artifactId>
@@ -252,16 +225,21 @@ limitations under the License.
                                <artifactId>org.argeo.slc.detached</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.lib.detached</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.simple</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.argeo.slc.runtime</groupId>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
-                               <version>${project.version}</version> </dependency>
-                       -->
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -287,11 +265,21 @@ limitations under the License.
                                <artifactId>org.argeo.slc.osgiboot</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.osgi</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.jemmy</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <!--
                                <dependency> <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ws.client</artifactId>
@@ -305,6 +293,12 @@ limitations under the License.
                                <artifactId>org.argeo.slc.ria</artifactId>
                                <version>${project.version}</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>
@@ -382,6 +376,19 @@ limitations under the License.
                                <version>2.1.7</version>
                        </dependency>
 
+                       <dependency>
+                               <groupId>net.sourceforge.mx4j</groupId>
+                               <artifactId>com.springsource.mx4j</artifactId>
+                               <version>3.0.2</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+
                        <!-- Unit tests -->
                        <dependency>
                                <groupId>org.junit</groupId>
@@ -392,6 +399,12 @@ limitations under the License.
                                <groupId>org.dbunit</groupId>
                                <artifactId>com.springsource.org.dbunit</artifactId>
                                <version>2.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
                        <!-- Logging -->
@@ -402,26 +415,24 @@ limitations under the License.
                                </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.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>
+                               <artifactId>com.springsource.slf4j.api</artifactId>
                                <version>${version.slf4j}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
-                               <artifactId>com.springsource.slf4j.jcl</artifactId>
+                               <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                                <version>${version.slf4j}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
-                               <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
+                               <artifactId>com.springsource.slf4j.log4j</artifactId>
                                <version>${version.slf4j}</version>
                        </dependency>
 
@@ -430,16 +441,34 @@ limitations under the License.
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.core</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.beans</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.context</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
@@ -447,77 +476,190 @@ limitations under the License.
                                        org.springframework.context.support
                                </artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.orm</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.jdbc</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.transaction</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.web</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.web.servlet</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.aop</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.jms</artifactId>
                                <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.ws</groupId>
                                <artifactId>org.springframework.oxm</artifactId>
                                <version>${version.spring-ws}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
+                       <!--  Spring DM (OSGi) -->
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.extender</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.core</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.web.extender</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.web</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.test</artifactId>
                                <version>${version.spring-osgi}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
-                               <groupId>org.argeo.slc.dep.osgi</groupId>
+                               <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-                               <version>1.0.0.argeo3</version>
+                               <version>1.0.0.argeo4</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+                       <!-- Security -->
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>org.springframework.security</artifactId>
+                               <version>2.0.4.A</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.springframework</groupId>
+                                               <artifactId>org.springframework.web</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.antlr</groupId>
+                               <artifactId>com.springsource.org.antlr</artifactId>
+                               <version>3.0.1</version>
                        </dependency>
 
                        <!-- AOP -->
@@ -544,14 +686,18 @@ limitations under the License.
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm</artifactId>
-                               <version>1.5.3</version>
+                               <version>${version.asm}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-                               <version>1.5.3</version>
+                               <version>${version.asm}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm.tree.analysis</artifactId>
+                               <version>${version.asm}</version>
                        </dependency>
-
                        <!-- Ant -->
                        <dependency>
                                <groupId>org.apache.ant</groupId>
@@ -574,6 +720,12 @@ limitations under the License.
                                <groupId>org.apache.bsf</groupId>
                                <artifactId>com.springsource.org.apache.bsf</artifactId>
                                <version>2.4.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.beanshell</groupId>
@@ -597,7 +749,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
-                               <version>1.1</version>
+                               <version>1.1.0.argeo1</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
@@ -614,6 +766,17 @@ limitations under the License.
                                <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
                                <version>1.2.2.osgi</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
+                               <version>1.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
 
                        <!-- DB Drivers -->
                        <dependency>
@@ -630,6 +793,12 @@ limitations under the License.
                                <groupId>com.mysql.jdbc</groupId>
                                <artifactId>com.springsource.com.mysql.jdbc</artifactId>
                                <version>5.1.6</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
                        <!-- XML -->
@@ -637,6 +806,12 @@ limitations under the License.
                                <groupId>org.codehaus.castor</groupId>
                                <artifactId>com.springsource.org.castor</artifactId>
                                <version>1.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.xerces</groupId>
@@ -768,8 +943,17 @@ limitations under the License.
                        <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 -->
+                               <version>3.3.1.GA</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>org.slf4j</groupId>
+                                               <artifactId>com.springsource.slf4j.api</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>net.sourceforge.jexcelapi</groupId>
@@ -779,7 +963,13 @@ limitations under the License.
                        <dependency>
                                <groupId>net.sourceforge.ehcache</groupId>
                                <artifactId>com.springsource.net.sf.ehcache</artifactId>
-                               <version>1.4.1</version>
+                               <version>1.6.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>edu.emory.mathcs.backport</groupId>
@@ -812,6 +1002,16 @@ limitations under the License.
                                <artifactId>org.argeo.dep.osgi.activemq</artifactId>
                                <version>${version.activemq}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
+                               <version>5.2.0.0001</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
+                               <version>5.2.0.0001</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
@@ -821,6 +1021,10 @@ limitations under the License.
                                                <groupId>org.apache.activemq</groupId>
                                                <artifactId>com.springsource.org.apache.activemq</artifactId>
                                        </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
                                </exclusions>
                        </dependency>
                        <!--
@@ -850,6 +1054,83 @@ limitations under the License.
                                <version>1.3.0</version>
                        </dependency>
 
+                       <!-- SSH -->
+                       <dependency>
+                               <groupId>com.jcraft.jsch</groupId>
+                               <artifactId>com.springsource.com.jcraft.jsch</artifactId>
+                               <version>0.1.25</version>
+                       </dependency>
+
+                       <!-- Scheduling -->
+                       <dependency>
+                               <groupId>com.opensymphony.quartz</groupId>
+                               <artifactId>com.springsource.org.quartz</artifactId>
+                               <version>1.6.2</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+                       <!-- Merged (temp title) -->
+                       <dependency>
+                               <groupId>org.argeo.dep.jemmy</groupId>
+                               <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+                               <version>0.2.2</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.jacob</groupId>
+                               <artifactId>org.argeo.dep.jacob</artifactId>
+                               <version>1.14.3.argeo4</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.jacob</groupId>
+                               <artifactId>org.argeo.dep.jacob.win32.x86</artifactId>
+                               <version>1.14.3.argeo4</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>org.springframework.jdbc</artifactId>
+                               <version>${version.spring}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.custommonkey.xmlunit</groupId>
+                               <artifactId>com.springsource.org.custommonkey.xmlunit</artifactId>
+                               <version>1.2.0</version>
+                       </dependency>
+
+                       <!-- Dynamic scripts -->
+                       <dependency>
+                               <groupId>org.beanshell</groupId>
+                               <artifactId>com.springsource.bsh</artifactId>
+                               <version>2.0.0.b4</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.codehaus.groovy</groupId>
+                               <artifactId>com.springsource.org.codehaus.groovy</artifactId>
+                               <version>1.6.3</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+                               <version>1.7.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.commons</groupId>
+                                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>
@@ -1063,19 +1344,20 @@ limitations under the License.
                                <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>
-                                               <configuration>
-                                                       <linkXref>true</linkXref>
-                                                       <targetJdk>1.5</targetJdk>
-                                                       <aggregate>true</aggregate>
-                                                       <excludes>
-                                                               <exclude>**/springutil/*.java</exclude>
-                                                       </excludes>
-                                               </configuration>
                                        </reportSet>
                                </reportSets>
                        </plugin>