Upgrade junit-jupiter to 5.8.1

15 files changed, 21 insertions, 17 deletions

diff --git a/abi-check-plugin/pom.xml b/abi-check-plugin/pom.xml
index 059e593c0e9..bfa3af30cb5 100644
--- a/abi-check-plugin/pom.xml
+++ b/abi-check-plugin/pom.xml
@@ -45,7 +45,6 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index e2cc7085353..d2ebb7ba9eb 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -32,8 +32,8 @@
         <jaxb.version>2.3.0</jaxb.version>
         <jetty.version>9.4.44.v20210927</jetty.version>
         <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
-        <junit5.version>5.7.0</junit5.version>
-        <junit5.platform.version>1.7.0</junit5.platform.version>
+        <junit5.version>5.8.1</junit5.version>
+        <junit5.platform.version>1.8.1</junit5.platform.version>
         <onnxruntime.version>1.8.0</onnxruntime.version>
         <org.lz4.version>1.8.0</org.lz4.version>
         <org.json.version>20090211</org.json.version>
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index f0223e28681..63fbd984860 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.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-        <junit.version>5.7.0</junit.version> <!-- NOTE: this must be in sync with junit version specified in 'tenant-cd-api' -->
+        <junit.version>5.8.1</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/parent/pom.xml b/parent/pom.xml
index 22925af4502..97c991d9693 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -812,6 +812,11 @@
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
                 <version>${junit.version}</version>
             </dependency>
@@ -897,7 +902,7 @@
         <commons.math3.version>3.6.1</commons.math3.version>
         <gson.version>2.8.9</gson.version>
         <jna.version>5.9.0</jna.version>
-        <junit.version>5.7.0</junit.version>
+        <junit.version>5.8.1</junit.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
         <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml
index acf62b1d6e6..f4923bf79f1 100644
--- a/tenant-base/pom.xml
+++ b/tenant-base/pom.xml
@@ -40,7 +40,7 @@
         <target_jdk_version>11</target_jdk_version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-        <junit.version>5.7.0</junit.version> <!-- Keep in sync with hosted-tenant-base and tenant-cd until all direct use is removed -->
+        <junit.version>5.8.1</junit.version> <!-- Keep in sync with hosted-tenant-base and tenant-cd until all direct use is removed -->
         <endpoint>https://api.vespa-external.aws.oath.cloud:4443</endpoint>
         <test.categories>!integration</test.categories>
     </properties>
diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml
index e45fd7e9586..5ac52748152 100644
--- a/tenant-cd-api/pom.xml
+++ b/tenant-cd-api/pom.xml
@@ -25,7 +25,7 @@
             This version must match the string in all ExportPackage annotations in this module.
             It must also be in sync junit version specified in 'hosted-tenant-base'.
         -->
-        <hosted-tenant-base-junit-version>5.7.0</hosted-tenant-base-junit-version>
+        <hosted-tenant-base-junit-version>5.8.1</hosted-tenant-base-junit-version>
 
     </properties>
 
diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/condition/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/condition/package-info.java
index 7d14bb7fd18..cc511f67528 100644
--- a/tenant-cd-api/src/main/java/org/junit/jupiter/api/condition/package-info.java
+++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/condition/package-info.java
@@ -2,7 +2,7 @@
 /**
  * @author bjorncs
  */
-@ExportPackage(version = @Version(major = 5, minor = 7, micro = 0))
+@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1))
 package org.junit.jupiter.api.condition;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/package-info.java
index 14080a1cb51..7ddb6761e06 100644
--- a/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/package-info.java
+++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/package-info.java
@@ -2,7 +2,7 @@
 /**
  * @author bjorncs
  */
-@ExportPackage(version = @Version(major = 5, minor = 7, micro = 0))
+@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1))
 package org.junit.jupiter.api.extension;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/function/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/function/package-info.java
index cd0efd44e3c..72f3fd82347 100644
--- a/tenant-cd-api/src/main/java/org/junit/jupiter/api/function/package-info.java
+++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/function/package-info.java
@@ -2,7 +2,7 @@
 /**
  * @author bjorncs
  */
-@ExportPackage(version = @Version(major = 5, minor = 7, micro = 0))
+@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1))
 package org.junit.jupiter.api.function;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/io/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/io/package-info.java
index 84b43e8e243..374aa823308 100644
--- a/tenant-cd-api/src/main/java/org/junit/jupiter/api/io/package-info.java
+++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/io/package-info.java
@@ -2,7 +2,7 @@
 /**
  * @author bjorncs
  */
-@ExportPackage(version = @Version(major = 5, minor = 7, micro = 0))
+@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1))
 package org.junit.jupiter.api.io;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/package-info.java
index da5e4f19c1f..75e33914d6c 100644
--- a/tenant-cd-api/src/main/java/org/junit/jupiter/api/package-info.java
+++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/package-info.java
@@ -2,7 +2,7 @@
 /**
  * @author bjorncs
  */
-@ExportPackage(version = @Version(major = 5, minor = 7, micro = 0))
+@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1))
 package org.junit.jupiter.api;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/parallel/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/parallel/package-info.java
index be7342d2f29..2abd95827e4 100644
--- a/tenant-cd-api/src/main/java/org/junit/jupiter/api/parallel/package-info.java
+++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/parallel/package-info.java
@@ -2,7 +2,7 @@
 /**
  * @author bjorncs
  */
-@ExportPackage(version = @Version(major = 5, minor = 7, micro = 0))
+@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1))
 package org.junit.jupiter.api.parallel;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml
index 6ec70b08d39..045ac050e4b 100644
--- a/vespa-osgi-testrunner/pom.xml
+++ b/vespa-osgi-testrunner/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.0</version>
+            <version>5.8.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.junit.jupiter</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>1.6.2</version>
+            <version>1.8.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.junit.jupiter</groupId>
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java
index ff66b31dfa8..e232e523cbf 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java
@@ -37,7 +37,7 @@ public class PomXmlGenerator {
             "    <version>1.0.0</version>\n" +
             "\n" +
             "    <properties>\n" +
-            "        <junit_version>5.7.0</junit_version>\n" +
+            "        <junit_version>5.8.1</junit_version>\n" +
             "        <surefire_version>2.22.0</surefire_version>\n" +
             "%PROPERTIES%" +
             "    </properties>\n" +
diff --git a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
index 269bbd2a3c3..b07bc9a26cc 100644
--- a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
+++ b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
@@ -6,7 +6,7 @@
     <version>1.0.0</version>
 
     <properties>
-        <junit_version>5.7.0</junit_version>
+        <junit_version>5.8.1</junit_version>
         <surefire_version>2.22.0</surefire_version>
         <my-comp.jar.path>components/my-comp.jar</my-comp.jar.path>
         <main.jar.path>main.jar</main.jar.path>