commit 571206e20a7d6cd795448b886722a475b56ce691
author Shawn McKinney <smckinney@apache.org> Fri Jan 04 15:05:12 2019 -0800
committer Shawn McKinney <smckinney@apache.org> Fri Jan 04 15:05:12 2019 -0800
tree d66809b219e0b4e262adbdcc73e131a2e5a212c0
parent 262424ee328800418634fe3ea7507e8f058a77e3
parent 358e00e8d1333cf52c1b792d63c469988494ce49

Merge branch 'pr/2'

pom.xml

diff --git a/pom.xml b/pom.xml
index 980a59e..dab79f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,19 @@
       <groupId>org.apache.wicket</groupId>
       <artifactId>wicket-spring</artifactId>
       <version>${wicket.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-fileupload</groupId>
+          <artifactId>commons-fileupload</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- Required as log as Wicket 7.0.x picks up Commons Fileupload 1.3.2 -->
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.3.3</version>
     </dependency>
     
     <dependency>