You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/04/17 05:22:56 UTC
[isis] 03/03: ISIS-2340: fixes commons-fileupload convergence issue
(wicket/vaadin)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0e6ffbc13309d8b22cbd54125a1ad54df5ce95db
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 17 07:22:37 2020 +0200
ISIS-2340: fixes commons-fileupload convergence issue (wicket/vaadin)
---
incubator/viewers/vaadin/ui/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/incubator/viewers/vaadin/ui/pom.xml b/incubator/viewers/vaadin/ui/pom.xml
index 2d5dd46..e0d4fc0 100644
--- a/incubator/viewers/vaadin/ui/pom.xml
+++ b/incubator/viewers/vaadin/ui/pom.xml
@@ -92,6 +92,18 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- convergence issue with wicket 1.3.3 vs 1.4 -->
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.4</version>
</dependency>
</dependencies>