summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vespa-osgi-testrunner/pom.xml14
-rw-r--r--vespa-testrunner-components/pom.xml11
2 files changed, 12 insertions, 13 deletions
diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml
index 62ea578f14f..db0dba89b8a 100644
--- a/vespa-osgi-testrunner/pom.xml
+++ b/vespa-osgi-testrunner/pom.xml
@@ -22,7 +22,6 @@
<scope>provided</scope>
</dependency>
- <!-- Verify that we need all junit deps -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
@@ -45,18 +44,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>5.6.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
<dependency>
<groupId>com.yahoo.vespa</groupId>
<artifactId>tenant-cd-api</artifactId>
diff --git a/vespa-testrunner-components/pom.xml b/vespa-testrunner-components/pom.xml
index 711e8f6d49c..e780da726a1 100644
--- a/vespa-testrunner-components/pom.xml
+++ b/vespa-testrunner-components/pom.xml
@@ -28,6 +28,17 @@
<artifactId>vespa-osgi-testrunner</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <!-- junit must be excluded to keep maven-surefire-plugin to be confused -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>