From 806d077a1cbc7b6d6b46e6fc734af35e6ecd8c0e Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Wed, 8 Aug 2018 15:40:46 +0300
Subject: Improved JaCoCo configuration

Declared JaCoCo Maven plugin under dependencyManagement to avoid
conflicting versions.

Change-Id: I11f3b575d6b3b34733e8f4379b9ba6b4bf4ba39b
Issue-ID: SDC-1596
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
---
 onboarding/pom.xml                                                | 8 ++++++--
 .../vnf-repository-rest-services/pom.xml                          | 1 -
 openecomp-be/pom.xml                                              | 2 +-
 pom.xml                                                           | 7 +++++--
 services/activity-spec/pom.xml                                    | 1 -
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 0e18c2d3cf..ea3f95dd59 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -26,12 +26,11 @@
 
     <properties>
 
-        <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
+        <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
         <jacoco.skip>true</jacoco.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Maven plugin versions -->
-        <jacoco.version>0.7.9</jacoco.version>
         <mvn.assembly.version>2.1</mvn.assembly.version>
         <mvn.compiler.version>3.7.0</mvn.compiler.version>
         <mvn.clean.version>2.5</mvn.clean.version>
@@ -284,6 +283,11 @@
                 <artifactId>swagger-annotations</artifactId>
                 <version>${swagger.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>${wire-mock.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
index bc11770bb0..f5f848a531 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
@@ -88,7 +88,6 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.18.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml
index e93576a803..b603499d5e 100644
--- a/openecomp-be/pom.xml
+++ b/openecomp-be/pom.xml
@@ -255,9 +255,9 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
                 <executions>
                     <execution>
+                        <id>default-prepare-agent</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
diff --git a/pom.xml b/pom.xml
index 5f4326e572..694bdd3f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,11 @@
     <build>
         <pluginManagement>
             <plugins>
-
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.1</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
@@ -266,7 +270,6 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.1</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
diff --git a/services/activity-spec/pom.xml b/services/activity-spec/pom.xml
index a5c8358c0b..2b4aa6cd0f 100644
--- a/services/activity-spec/pom.xml
+++ b/services/activity-spec/pom.xml
@@ -22,7 +22,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <mvn.surefire.version>2.19.1</mvn.surefire.version>
-        <jacoco.version>0.7.9</jacoco.version>
         <mvn.compiler.version>2.5.1</mvn.compiler.version>
         <mvn.license.version>1.10</mvn.license.version>
         <mvn.assembly.version>2.1</mvn.assembly.version>
-- 
cgit 1.2.3-korg