X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=958a3875821d1a41c5474872b762f800e9a68da0;hb=d9c37ddf97e913b552b318d9a7eeb02d1d6fa3c4;hp=c06199e438993f3073bfb5dcab495e52523a65d8;hpb=2ef825e48090ee698863e3af4d2dd918e6a19c55;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index c06199e43..958a38758 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.12.1-SNAPSHOT</version>
 	<modules>
 		<module>runtime</module>
 		<module>dep</module>
@@ -16,8 +15,8 @@
 		<module>archetypes</module>
 	</modules>
 	<properties>
-		<developmentCycle>0.11</developmentCycle>
-		<version.argeo-ria>0.11.4-SNAPSHOT</version.argeo-ria>
+		<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>
@@ -25,12 +24,13 @@
 		<version.ant>1.7.0</version.ant>
 		<version.jetty>6.1.14</version.jetty>
 		<version.tomcat>6.0.18</version.tomcat>
-		<version.equinox>3.5.0.v20090311-1300</version.equinox>
+		<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.15-SNAPSHOT</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>0.8.2-SNAPSHOT</version.maven-argeo-qooxdoo>
+		<version.maven-argeo-osgi>0.1.18</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 +191,6 @@ limitations under the License.
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy,site-deploy</goals>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -275,6 +274,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>
@@ -394,6 +398,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 -->
@@ -675,14 +685,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>
@@ -751,6 +765,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>
@@ -917,13 +942,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>
@@ -934,7 +962,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>
@@ -973,6 +1001,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>
@@ -1069,11 +1107,17 @@ limitations under the License.
 				<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>