Allow application projects to run unit tests using junit4

2 files changed, 32 insertions, 14 deletions

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index c46cc26dd03..cf49b334ae7 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -31,6 +31,8 @@
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <jaxb.version>2.3.0</jaxb.version>
         <jetty.version>9.4.30.v20200611</jetty.version>
+        <junit5.version>5.6.2</junit5.version>
+        <junit5.platform.version>1.6.2</junit5.platform.version>
         <org.lz4.version>1.7.1</org.lz4.version>
         <org.json.version>20090211</org.json.version>
         <slf4j.version>1.7.5</slf4j.version>
@@ -258,10 +260,11 @@
                                         <include>org.eclipse.jetty:jetty-servlet:[${jetty.version}]:jar:test</include>
                                         <include>org.eclipse.jetty:jetty-servlets:[${jetty.version}]:jar:test</include>
                                         <include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include>
-                                        <include>org.junit.jupiter:junit-jupiter-api:5.6.2:jar:test</include>
-                                        <include>org.junit.jupiter:junit-jupiter-engine:5.6.2:jar:test</include>
-                                        <include>org.junit.platform:junit-platform-commons:1.6.2:jar:test</include>
-                                        <include>org.junit.platform:junit-platform-engine:1.6.2:jar:test</include>
+                                        <include>org.junit.jupiter:junit-jupiter-api:[${junit5.version}]:jar:test</include>
+                                        <include>org.junit.jupiter:junit-jupiter-engine:[${junit5.version}]:jar:test</include>
+                                        <include>org.junit.platform:junit-platform-commons:[${junit5.platform.version}]:jar:test</include>
+                                        <include>org.junit.platform:junit-platform-engine:[${junit5.platform.version}]:jar:test</include>
+                                        <include>org.junit.vintage:junit-vintage-engine:[${junit5.version}]:jar:test</include>
                                         <include>org.kohsuke:libpam4j:1.11:jar:test</include>
                                         <include>org.opentest4j:opentest4j:1.2.0:jar:test</include>
                                         <include>org.tensorflow:libtensorflow:[${tensorflow.version}]:jar:test</include>
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index 7afafb96280..86b28368db7 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -37,6 +37,7 @@
         <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.6.2</junit.version> <!-- NOTE: this must be in sync with junit version specified in 'tenant-cd-api' -->
+        <junit4.version>4.13</junit4.version> <!-- NOTE: must be compatible with junit5 vintage engine -->
         <test.categories>!integration</test.categories>
 
         <!-- To allow specialized base pom to include additional "test provided" dependencies -->
@@ -68,16 +69,10 @@
             </dependency>
 
             <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <!-- Note: applications must manually add junit4 in pom.xml -->
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>{junit4.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -108,7 +103,26 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <!-- Allow applications to use Junit4 in unit tests (assuming junit4 is added to application's pom.xml) -->
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -195,6 +209,7 @@
                                 com.yahoo.vespa:container-test:runtime,
                                 org.junit.jupiter:junit-jupiter-api:provided,
                                 org.junit.jupiter:junit-jupiter-engine:test,
+                                org.junit.jupiter:junit-vintage-engine:test,
                                 com.yahoo.vespa:tenant-cd-api:provided
                             </testBundleScopeOverrides>
                         </configuration>