<modules>
<module>runtime</module>
<module>dep</module>
+ <module>modules</module>
<module>server</module>
<module>demo</module>
<module>integration-tests</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.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.equinox>3.5.0.v20090311-1300</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.14-SNAPSHOT</version.maven-argeo-osgi>
+ <version.maven-argeo-osgi>0.1.15-SNAPSHOT</version.maven-argeo-osgi>
+ <version.maven-argeo-qooxdoo>0.8.2-SNAPSHOT</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>
<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>
<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>
<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>\r
+ <dependency>\r
+ <groupId>org.argeo.slc.runtime</groupId>\r
+ <artifactId>org.argeo.slc.support.jemmy</artifactId>\r
+ <version>${project.version}</version>\r
</dependency>
<!--
<dependency> <groupId>org.argeo.slc.runtime</groupId>
<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>
<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>
<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 -->
</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>
<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>
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 -->
<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>
<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>
<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>
<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 -->
<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>
<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>
<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>
<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>
<!--
<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>
+
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>com.springsource.bsh</artifactId>
+ <version>2.0.0.b4</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>