From 03575373024593fd1cac6812f0992152edde4d37 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 13 Oct 2017 12:07:01 -0400
Subject: Fix installation issues with generic-resource-api

Updated generic-resource-api to use Aries blueprint to install and
resolved issues preventing it from installing properly in karaf.

Change-Id: Iaef8bdb7a9e6aaf149a8e8a0d847197cf3f704a9
Issue-ID: SDNC-109
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 generic-resource-api/provider/pom.xml | 89 ++---------------------------------
 1 file changed, 5 insertions(+), 84 deletions(-)

(limited to 'generic-resource-api/provider/pom.xml')

diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml
index 2f4a25fb..23375b54 100644
--- a/generic-resource-api/provider/pom.xml
+++ b/generic-resource-api/provider/pom.xml
@@ -8,13 +8,13 @@
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>generic-resource-api.provider</artifactId>
+	<artifactId>generic-resource-api-provider</artifactId>
 	<packaging>bundle</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.onap.sdnc.northbound</groupId>
-			<artifactId>generic-resource-api.model</artifactId>
+			<artifactId>generic-resource-api-model</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.opendaylight.controller</groupId>
@@ -97,25 +97,7 @@
 
 	<build>
 	    <plugins>
-        <!--
-	        <plugin>
-                <groupId>com.brocade.tools</groupId>
-                    <artifactId>providermodule-plugin</artifactId>
-                    <version>1.0.0-SNAPSHOT</version>
-                    <configuration>
-                        <packageId>org.onap.sdnc.northbound</packageId>
-                        <appName>generic-resource-api</appName>
-                    </configuration>
-                    <executions>
-                       <execution>
-                          <phase>process-sources</phase>
-                          <goals>
-                              <goal>process</goal>
-                          </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
+
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -127,69 +109,8 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.opendaylight.yangtools</groupId>
-				<artifactId>yang-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>config</id>
-						<goals>
-							<goal>generate-sources</goal>
-						</goals>
-						<configuration>
-							<codeGenerators>
-								<generator>
-									<codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-									<outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-									<additionalConfiguration>
-										<namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-									</additionalConfiguration>
-								</generator>
-								<generator>
-									<codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-									<outputBaseDir>${salGeneratorPath}</outputBaseDir>
-								</generator>
-							</codeGenerators>
-							<inspectDependencies>true</inspectDependencies>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.opendaylight.mdsal</groupId>
-						<artifactId>maven-sal-api-gen-plugin</artifactId>
-						<version>${odl.sal.api.gen.plugin.version}</version>
-						<type>jar</type>
-					</dependency>
-					<dependency>
-						<groupId>org.opendaylight.controller</groupId>
-						<artifactId>yang-jmx-generator-plugin</artifactId>
-						<version>${odl.yang.jmx.generator.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>${project.build.directory}/classes/initial/generic-resource-api-provider.xml</file>
-									<type>xml</type>
-									<classifier>config</classifier>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+
+
 		</plugins>
 	</build>
 </project>
-- 
cgit 1.2.3-korg