From b7c21e18163eb851327ab12c110a1e6b256b9535 Mon Sep 17 00:00:00 2001
From: Ryan Young <ry303t@att.com>
Date: Mon, 13 Aug 2018 22:37:11 -0400
Subject: Karaf 4 for appc-provider

Change-Id: Id0f8f51426a5595f51943e8b9d1bb62ed8ee1c8d
Issue-ID: APPC-1028
Signed-off-by: Ryan Young <ry303t@att.com>
---
 appc-provider/appc-provider-model/pom.xml | 36 +++++++------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

(limited to 'appc-provider/appc-provider-model')

diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml
index 83dfe14b4..f9d2ee883 100644
--- a/appc-provider/appc-provider-model/pom.xml
+++ b/appc-provider/appc-provider-model/pom.xml
@@ -22,16 +22,17 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>appc-provider</artifactId>
-        <groupId>org.onap.appc</groupId>
+    <parent>        
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
         <version>1.4.0-SNAPSHOT</version>
     </parent>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-provider-model</artifactId>
     <packaging>bundle</packaging>
 
+    <name>appc-provider-model</name>
     <build>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -39,15 +40,15 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>!com.google.common.collect,!com.google.common.base,*</Import-Package>
-                        <Embed-Dependency>guava</Embed-Dependency>
+<!--                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> -->
+<!--                         <Bundle-Version>${project.version}</Bundle-Version> -->
+<!--                         <Export-Package>org.onap.appc</Export-Package> -->
                     </instructions>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${odl.yangtools.version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
@@ -74,30 +75,9 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- <plugin> -->
-            <!-- <groupId>org.codehaus.mojo</groupId> -->
-            <!-- <artifactId>build-helper-maven-plugin</artifactId> -->
-            <!-- <version>1.12</version> -->
-            <!-- <executions> -->
-            <!-- <execution> -->
-            <!-- <id>add-generated-source</id> -->
-            <!-- <phase>generate-sources</phase> -->
-            <!-- <goals> -->
-            <!-- <goal>add-source</goal> -->
-            <!-- </goals> -->
-            <!-- <configuration> -->
-            <!-- <sources> -->
-            <!-- project.build.directory defaults to be the "target" folder -->
-            <!-- <source>${project.build.directory}/generated-sources/yang-gen-sal</source> -->
-            <!-- </sources> -->
-            <!-- </configuration> -->
-            <!-- </execution> -->
-            <!-- </executions> -->
-            <!-- </plugin> -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
                 <executions>
                     <execution>
                         <id>yang</id>
-- 
cgit 1.2.3-korg