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 70a25540d5e212fe8cc4a269a667c94ac2722041..a576c7aae831b460a213390997281606c503fda7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@ limitations under the License.
                                <groupId>org.argeo.slc.runtime</groupId>\r
                                <artifactId>org.argeo.slc.support.jemmy</artifactId>\r
                                <version>${project.version}</version>\r
-                       </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>