diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-09-04 13:40:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 13:40:40 +0200 |
| commit | e242ceee5206a60502ecc7880e694cb0ae84342e (patch) | |
| tree | d41b0205906f0ed5a3f05685db4972f4a3760bfb | |
| parent | 9144a825b8eaba6ffd4b5b79c6c7c57a9d6813b2 (diff) | |
| parent | cb493146bd531faf5e9d1fe509bc2a24fb4bc454 (diff) | |
Merge pull request #14287 from vespa-engine/bjorncs/fix-junit4-take-2
Provided junit4 in test scope
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 21 |
2 files changed, 3 insertions, 20 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index cf49b334ae7..5e35cdf7952 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -241,6 +241,7 @@ <include>io.prometheus:simpleclient:0.6.0:jar:test</include> <include>io.prometheus:simpleclient_common:0.6.0:jar:test</include> <include>joda-time:joda-time:2.8.1:jar:test</include> + <include>junit:junit:4.13:jar:test</include> <include>net.arnx:jsonic:1.2.11:jar:test</include> <include>net.java.dev.jna:jna:4.5.2:jar:test</include> <include>org.abego.treelayout:org.abego.treelayout.core:1.0.1:jar:test</include> @@ -259,6 +260,7 @@ <include>org.eclipse.jetty:jetty-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-servlet:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-servlets:[${jetty.version}]:jar:test</include> + <include>org.hamcrest:hamcrest-core:1.3:jar:test</include> <include>org.hdrhistogram:HdrHistogram:2.1.8: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> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index e021d4f9c63..66c9f37c5c9 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -37,7 +37,6 @@ <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 --> @@ -67,14 +66,6 @@ <type>pom</type> <scope>import</scope> </dependency> - - <dependency> - <!-- Note: applications must manually add junit4 in pom.xml --> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit4.version}</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> @@ -108,21 +99,11 @@ </dependency> <dependency> - <!-- Allow applications to use Junit4 in unit tests (assuming junit4 is added to application's pom.xml) --> + <!-- Allow applications to use Junit4 in unit tests --> <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> |