X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-metric%2Fappc-metric-bundle%2Fpom.xml;h=d1620a64b2eb3e6fd3d50364d9d02eaf1ef2310b;hb=d4c14b1b7ae6204adc0738ad70be98e94f6bf6dc;hp=51125713e9f4c400812c0e8c0759de2c29524b7c;hpb=8843969b0ced23dd4ebda915641427ee10aee098;p=appc.git

diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index 51125713e..d1620a64b 100644
--- a/appc-metric/appc-metric-bundle/pom.xml
+++ b/appc-metric/appc-metric-bundle/pom.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 Amdocs
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
     <modelVersion>4.0.0</modelVersion>
-		<parent>
-	    <groupId>org.openecomp.appc</groupId>
-	    <artifactId>appc-metric</artifactId>
-	    <version>1.0.0-SNAPSHOT</version>
-	  </parent>
-    <groupId>org.openecomp.appc</groupId>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.5.0</version>
+        <relativePath />
+    </parent>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-metric-bundle</artifactId>
     <packaging>bundle</packaging>
 
@@ -40,9 +42,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-        	<groupId>org.openecomp.appc</groupId>
-        	<artifactId>appc-common</artifactId>
-        	<version>${project.version}</version>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-common-bundle</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -57,8 +59,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 +72,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,22 +85,22 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Bundle-Activator>org.openecomp.appc.MetricActivator</Bundle-Activator>
-                        <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency>
+                        <Bundle-Activator>org.onap.appc.MetricActivator</Bundle-Activator>
+                        <Embed-Dependency>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-Service>org.onap.appc.metricservice.impl.MetricServiceImpl,org.onap.appc.metricservice.MetricService,org.onap.appc.metricservice.policy.*,org.onap.appc.metricservice.metric.*</Export-Service>
+                        <Export-Package>org.onap.appc.metricservice,org.onap.appc.metricservice.impl,org.onap.appc.metricservice.policy,org.onap.appc.metricservice.publisher,org.onap.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.*,*;resolution:=optional</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+    <version>1.5.0-SNAPSHOT</version>
 </project>