diff options
| author |   Tomasz Golabek <tomasz.golabek@nokia.com> | 2019-04-23 16:26:08 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-04-26 15:26:24 +0000 |
| commit | a490dfcbf9bb06484998362847715ec589abf2a9 (patch) | |
| tree | 40f3949e822ad8b9e65affd33fc6b6417dc6fec0 | |
| parent | d0fc0ea340a45569045fd3e7a3a5659ded7b2593 (diff) | |
Fix for incorrect count of coverage
Increased version of junit-jupiter.version and junit-vintage.version
Removed junit-platform-surefire-provider (not needed since surefire2.22)
Enabled jacoco for some tests from onboarding package
Change-Id: I05093b263de1ce93af88a3f99587a4050568caa3
Issue-ID: SDC-2250
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
| -rw-r--r-- | common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml | 15 | ||||
| -rw-r--r-- | pom.xml | 41 |
2 files changed, 24 insertions, 32 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 f6f5eec68a..70c84240b2 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,10 +13,10 @@ <artifactId>onap-generic-artifact-browser-service</artifactId> <properties> - <lombok.version>1.18.2</lombok.version> <snakeyaml.version>1.21</snakeyaml.version> <jsurfer.version>1.4.3</jsurfer.version> + <jacoco.skip>false</jacoco.skip> </properties> <dependencies> @@ -61,16 +61,10 @@ </dependency> <dependency> <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> + <artifactId>junit-jupiter</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> @@ -83,6 +77,11 @@ <target>8</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + </plugin> </plugins> </build> @@ -106,8 +106,8 @@ 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-jupiter.version>5.4.0</junit-jupiter.version> + <junit-vintage.version>5.4.0</junit-vintage.version> <junit-platform.version>1.1.0</junit-platform.version> <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version> @@ -214,6 +214,21 @@ Modifications copyright (c) 2018 Nokia <artifactId>netty-handler</artifactId> <version>4.0.45.Final</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> </dependencyManagement> @@ -315,28 +330,6 @@ Modifications copyright (c) 2018 Nokia <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <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> |