X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=35f0eaca9e213cf767d9a6718ec9a062f30a39d0;hb=f590e4a3e12d97a4242351f25800ce1488a88e01;hp=70a25540d5e212fe8cc4a269a667c94ac2722041;hpb=a93f764f655011c0b53c3dca829253246f5f0a1e;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 70a25540d..35f0eaca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@ limitations under the License.
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.jemmy</artifactId>
 				<version>${project.version}</version>
-			</dependency>      
+			</dependency>
 			<!--
 				<dependency> <groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ws.client</artifactId>
@@ -399,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 -->
@@ -756,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>
@@ -922,13 +939,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>
@@ -939,7 +959,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>