aboutsummaryrefslogtreecommitdiffstats
path: root/hosted-tenant-base
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-09-04 13:20:36 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-09-04 13:20:38 +0200
commitcb493146bd531faf5e9d1fe509bc2a24fb4bc454 (patch)
treeb7df06ea6098e8359c183cfe9fb98c15827f567e /hosted-tenant-base
parent9ad335c57ff4b0fa86e9e00a54be65ec96ba8853 (diff)
Provided junit4 in test scope
IntelliJ fails to run unit tests if vintage-engine is on classpath, but not junit4.
Diffstat (limited to 'hosted-tenant-base')
-rw-r--r--hosted-tenant-base/pom.xml21
1 files changed, 1 insertions, 20 deletions
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>