X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=721a5dd20b0ad600f61d871c5e495d498e8695f3;hb=fb4292b29706a4d3e854707283ba93b56bb5c282;hp=53ca93cd461b875dad2034e5cb5d90383e4da56f;hpb=687353cae149bfc4a6cbfa46b89f665c19f7d594;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 53ca93cd4..721a5dd20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 		<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>
@@ -274,6 +274,11 @@ limitations under the License.
 				<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>
@@ -394,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 -->
@@ -751,6 +762,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,15 +939,23 @@ 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>org.jboss.javassist</groupId>
+				<artifactId>com.springsource.javassist</artifactId>
+				<version>3.9.0.GA</version>
+			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.jexcelapi</groupId>
 				<artifactId>com.springsource.jxl</artifactId>
@@ -934,7 +964,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>