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/01/04 14:07:39 UTC
[isis] 03/03: ISIS-1978: fixes dependency convergence issue
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a1376d7017377f4a06fc9de7c16574d544ef542d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 14:06:04 2019 +0000
ISIS-1978: fixes dependency convergence issue
---
core/detached-tests/pom.xml | 2 +-
core/pom.xml | 1 +
core/specsupport/pom.xml | 13 +++++++++++++
core/unittestsupport/pom.xml | 2 +-
example/misc/metamodel/jsr303/pom.xml | 2 +-
5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 664d78d..68770aa 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -85,7 +85,7 @@
<!-- JUnit 4 compile dependency in unittestsupport's src/main/java folder, non-transitive -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit-legacy.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 9d5b379..c4b4d98 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -179,6 +179,7 @@
<htmlparser.version>2.1</htmlparser.version>
<junit.version>5.3.1</junit.version>
+ <junit-legacy.version>4.12</junit-legacy.version>
<assertj.version>3.11.1</assertj.version>
<!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index d7a7771..5d2cd9d 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -67,6 +67,19 @@
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-junit</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit-legacy.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 5b6ccca..568b946 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -73,7 +73,7 @@
non-transitive -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit-legacy.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
diff --git a/example/misc/metamodel/jsr303/pom.xml b/example/misc/metamodel/jsr303/pom.xml
index 9a200fe..3dfb11c 100644
--- a/example/misc/metamodel/jsr303/pom.xml
+++ b/example/misc/metamodel/jsr303/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
</dependency>
<dependency>