You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/10/28 07:33:05 UTC
[02/21] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
ISIS-1223 Upgrade Wicket to 7.x
Fix Maven dependency convergences.
Fix indents.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8eab4577
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8eab4577
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8eab4577
Branch: refs/heads/master
Commit: 8eab4577340e0b15b0b5db5454ed1f10e89ba5b7
Parents: dc976bc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 21:22:47 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 21:22:47 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++++
core/viewer-wicket-applib/pom.xml | 18 +++++++++---------
core/viewer-wicket-model/pom.xml | 16 ++++++++--------
3 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index aed6870..8f481cb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1491,6 +1491,10 @@ ${license.additional-notes}
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index aae5322..e896f80 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -52,16 +52,16 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 66bb1cf..4acaa6a 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-applib</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-wicket-applib</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>