summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-01 14:24:57 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-01 14:24:57 +0200
commit39361671528996cad45f09e600d00a0731e322f6 (patch)
tree39fb2331d1a3bb60c561f3c2d465d8da333b9548
parentf044937f6a35ea3df9e40dedf3ed9d7d88dbee75 (diff)
Match junit version in 'tenant-cd-api' with 'hosted-tenant-base'
-rw-r--r--hosted-tenant-base/pom.xml2
-rw-r--r--tenant-cd-api/pom.xml14
2 files changed, 13 insertions, 3 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index cf3b040220b..cecb0ffc461 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -36,7 +36,7 @@
<target_jdk_version>11</target_jdk_version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
- <junit.version>5.4.2</junit.version>
+ <junit.version>5.6.2</junit.version> <!-- NOTE: this must be in sync with junit version specified in 'tenant-cd-api' -->
<test.categories>!integration</test.categories>
<!-- To allow specialized base pom to include additional "test provided" dependencies -->
diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml
index 23e5f3ec3f4..47e0f6e3fe6 100644
--- a/tenant-cd-api/pom.xml
+++ b/tenant-cd-api/pom.xml
@@ -19,6 +19,16 @@
<relativePath>../parent</relativePath>
</parent>
+ <properties>
+
+ <!--
+ This version must match the string in all ExportPackage annotations.
+ It must also be in sync junit version specified in 'hosted-tenant-base'.
+ -->
+ <hosted-tenant-base-junit-version>5.6.2</hosted-tenant-base-junit-version>
+
+ </properties>
+
<dependencies>
<!-- provided -->
<dependency>
@@ -42,10 +52,10 @@
</dependency>
<!-- compile -->
- <dependency> <!-- TODO(bjorncs): share junit version number with test-runner implementation -->
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.2</version> <!-- NOTE: This version must match the string in all ExportPackage annotations -->
+ <version>${hosted-tenant-base-junit-version}</version>
<scope>compile</scope>
</dependency>
</dependencies>