diff options
| author |   Tomasz Golabek <tomasz.golabek@nokia.com> | 2019-04-11 11:47:50 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-04-20 11:04:58 +0000 |
| commit | 04aecc5c84e2b2f4c59ec86850d6bcd25d3bc912 (patch) | |
| tree | e3758d8c08636884c9e12955abf56b24baaae707 | |
| parent | 8fa77ad4d4c2498e40a4c23e6826d9ad73a1dab8 (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>
| -rw-r--r-- | common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml | 30 | ||||
| -rw-r--r-- | pom.xml | 28 |
2 files changed, 35 insertions, 23 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> @@ -106,6 +106,10 @@ Modifications copyright (c) 2018 Nokia <cucumber.version>2.4.0</cucumber.version> <bean-matchers.version>0.11</bean-matchers.version> <hamcrest-all.version>1.3</hamcrest-all.version> + <junit-jupiter.version>5.1.0</junit-jupiter.version> + <junit-vintage.version>5.1.0</junit-vintage.version> + <junit-platform.version>1.1.0</junit-platform.version> + <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version> <!-- parser--> <sdc-tosca-parser.version>1.3.5</sdc-tosca-parser.version> @@ -310,7 +314,29 @@ Modifications copyright (c) 2018 Nokia <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.0</version> + <version>${maven-surefire-plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-surefire-provider</artifactId> + <version>${junit-platform.version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit-platform.version}</version> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit-jupiter.version}</version> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit-vintage.version}</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |