From 76706005ee07da01fc3e00ed44ada720e29855b1 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Mon, 4 Sep 2017 21:37:25 -0700
Subject: Change to CCSDK and ODL Carbon

Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-Id: [APPC-91]
Issue-Id: [APPC-158]
---
 appc-metric/appc-metric-bundle/pom.xml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'appc-metric')

diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index c3673e327..84baddffd 100644
--- a/appc-metric/appc-metric-bundle/pom.xml
+++ b/appc-metric/appc-metric-bundle/pom.xml
@@ -57,8 +57,7 @@
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.2</version>
+            <artifactId>powermock-api-mockito</artifactId>            
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -71,16 +70,10 @@
             <artifactId>objenesis</artifactId>
             <version>2.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.8.4</version>
-        </dependency>
-
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -90,7 +83,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -100,8 +92,8 @@
                         <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Export-Service>org.openecomp.appc.metricservice.impl.MetricServiceImpl,org.openecomp.appc.metricservice.MetricService,org.openecomp.appc.metricservice.policy.*,org.openecomp.appc.metricservice.metric.*</Export-Service>
-                        <Export-Package>org.openecomp.appc.metricservice,org.openecomp.appc.metricservice.impl,org.openecomp.appc.metricservice.policy,org.openecomp.appc.metricservice.publisher,org.openecomp.appc.metricservice.metric</Export-Package>
-                        <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*</Import-Package>
+                        <Export-Package>org.openecomp.appc.metricservice,org.openecomp.appc.metricservice.impl,org.openecomp.appc.metricservice.policy,org.openecomp.appc.metricservice.publisher,org.openecomp.appc.metricservice.metric,org.apache.http</Export-Package>
+                        <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
-- 
cgit 1.2.3-korg