From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Jul 2009 15:53:07 +0000 (+0000)
Subject: File upload
X-Git-Tag: argeo-slc-2.1.7~1648
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0a14c27f7ac6a001ab3f76984fe2895a538a2372;p=gpl%2Fargeo-slc.git

File upload

git-svn-id: https://svn.argeo.org/slc/trunk@2739 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/pom.xml b/pom.xml
index 70a25540d..a576c7aae 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>