aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTomasz Golabek <tomasz.golabek@nokia.com>2019-04-11 11:47:50 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-04-20 11:04:58 +0000
commit04aecc5c84e2b2f4c59ec86850d6bcd25d3bc912 (patch)
treee3758d8c08636884c9e12955abf56b24baaae707 /common
parent8fa77ad4d4c2498e40a4c23e6826d9ad73a1dab8 (diff)
Fix for jupiter tests execution.
Currently mvn-surefire-plugin doesnt execute junit5 tests. Purpose of this merge request is to resolve the problem. Change-Id: Idb63483c87b1137b21beabed9d24bbff6f01cf53 Issue-ID: SDC-2094 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
Diffstat (limited to 'common')
-rw-r--r--common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml30
1 files changed, 8 insertions, 22 deletions
diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml
index 822dfa7ff6..f6f5eec68a 100644
--- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml
+++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml
@@ -13,8 +13,7 @@
<artifactId>onap-generic-artifact-browser-service</artifactId>
<properties>
- <junit.version>5.4.0</junit.version>
- <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+
<lombok.version>1.18.2</lombok.version>
<snakeyaml.version>1.21</snakeyaml.version>
<jsurfer.version>1.4.3</jsurfer.version>
@@ -53,15 +52,8 @@
<version>${commons.io.version}</version>
</dependency>
-
<!--test-->
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest-all.version}</version>
@@ -69,25 +61,19 @@
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>