X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=1a0cbd43a56a27c8c80e1c3c1f75e3888edfbb61;hb=f2e96749789a4e22ab41dfb4efb2eda4ee303e63;hp=571d5d3090e9445c4e93bd419628f5e739b96692;hpb=90e0f279286d0247542e8557272d47c8064b822b;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 571d5d309..1a0cbd43a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,10 @@
-<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.11.5-SNAPSHOT</version>
 	<modules>
 		<module>runtime</module>
 		<module>dep</module>
@@ -17,7 +16,7 @@
 	</modules>
 	<properties>
 		<developmentCycle>0.11</developmentCycle>
-		<version.argeo-ria>0.11.4-SNAPSHOT</version.argeo-ria>
+		<version.argeo-ria>0.11.4</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>
@@ -29,8 +28,8 @@
 		<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.2-SNAPSHOT</version.maven-argeo-qooxdoo>
+		<version.maven-argeo-osgi>0.1.15</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>
@@ -191,7 +190,6 @@ limitations under the License.
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy,site-deploy</goals>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -225,6 +223,11 @@ 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>
@@ -270,6 +273,11 @@ limitations under the License.
 				<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>
@@ -366,6 +374,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>
@@ -376,6 +397,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 -->
@@ -733,6 +760,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>
@@ -899,13 +937,16 @@ 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>
@@ -916,7 +957,7 @@ 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>
@@ -955,6 +996,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>