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>
---
 .../vendor-software-products-rest/vnf-repository-rest-services/pom.xml  | 1 -
 openecomp-be/pom.xml                                                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'openecomp-be')

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>
-- 
cgit 1.2.3-korg