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 2019/11/20 21:31:11 UTC
[isis] 04/05: ISIS-2181: fixes dependency convergence issues
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2181
in repository https://gitbox.apache.org/repos/asf/isis.git
View the commit online:
https://github.com/apache/isis/commit/8aa5cc892add7267082b55a00313df7b99a2a565
commit 8aa5cc892add7267082b55a00313df7b99a2a565
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 20:16:56 2019 +0000
ISIS-2181: fixes dependency convergence issues
---
core/pom.xml | 4 ++--
mavendeps/webapp/pom.xml | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e654a1b..a44fb34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -161,8 +161,8 @@
<togglz.version>2.1.0.Final</togglz.version>
<wicket.version>8.6.1</wicket.version>
- <wicket-bootstrap.version>2.0.10</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
- <wicket-bootstrap-core.version>2.0.4</wicket-bootstrap-core.version>
+ <wicket-bootstrap.version>2.0.11</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
+ <wicket-bootstrap-core.version>2.0.11</wicket-bootstrap-core.version>
<wicket-bootstrap-datetimepicker.version>4.17.37-1</wicket-bootstrap-datetimepicker.version>
<wicket-fullcalendar.version>2.2.0</wicket-fullcalendar.version>
<wicket-source.version>7.0.0</wicket-source.version>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 5e2a6d8..6b65390 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -39,6 +39,25 @@
</property>
</activation>
+ <properties>
+ <jsr305.version>3.0.2</jsr305.version>
+ <error_prone_annotations.version>2.3.2</error_prone_annotations.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${error_prone_annotations.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<!-- SPRING -->