From e2b2138f05e9eaf3eb89f9a65859433cf79b9960 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= <adetalhouet89@gmail.com>
Date: Tue, 21 Aug 2018 11:29:49 -0400
Subject: [PATCH] Fix packaging of netbox-client
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The script previously used packaged the netbox-client with
*-mvnrepo_zip.zip which is not what ccsdk-distribbution/odlsli
is expecting, as the classifier should be repo.

Also, using the *-osgi artifact is actually not helping
satisfying OSGi as it's causing wiring issues. Instead,
we used the plain jar instead of the bundle, and it seems
to fix the issue, as those jar gets already populated in the
classpath.

Change-Id: If1f3c3d384c2ee42b7f747fbacc46415bacf5f6e
Issue-ID: CCSDK-462
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 netbox-client/installer/pom.xml                            | 14 +++++++-------
 .../installer/src/assembly/assemble_mvnrepo_zip.xml        |  2 +-
 netbox-client/provider/pom.xml                             | 13 +++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml
index 2e8680d9..04ab0ed7 100755
--- a/netbox-client/installer/pom.xml
+++ b/netbox-client/installer/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
@@ -33,10 +33,9 @@
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
 
     <properties>
-        <application.name>sdnc-netbox-client</application.name>
+        <application.name>ccsdk-netbox-client</application.name>
         <features.boot>${application.name}</features.boot>
-        <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features
-        </features.repositories>
+        <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
@@ -61,6 +60,7 @@
             <artifactId>netbox-client-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -76,12 +76,12 @@
                         </goals>
                         <phase>package</phase>
                         <configuration>
-                            <attach>false</attach>
+                            <attach>true</attach>
                             <finalName>stage/${application.name}-${project.version}</finalName>
                             <descriptors>
                                 <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                             </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
+                            <appendAssemblyId>true</appendAssemblyId>
                         </configuration>
                     </execution>
                     <execution>
@@ -120,7 +120,7 @@
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <excludeGroupIds>org.onap.ccsdk.sli.core,org.opendaylight</excludeGroupIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>
diff --git a/netbox-client/installer/src/assembly/assemble_mvnrepo_zip.xml b/netbox-client/installer/src/assembly/assemble_mvnrepo_zip.xml
index 4950f527..b905cfe3 100644
--- a/netbox-client/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/netbox-client/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -20,7 +20,7 @@
   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>mvnrepo_zip</id>
+    <id>repo</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml
index 16695f20..2ffcaea9 100644
--- a/netbox-client/provider/pom.xml
+++ b/netbox-client/provider/pom.xml
@@ -34,6 +34,7 @@
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
 
     <dependencies>
+
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -41,18 +42,18 @@
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-osgi</artifactId>
-            <version>${apache.httpcomponents.client.version}</version>
+            <artifactId>httpcore</artifactId>
+            <version>${apache.httpcomponents.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpasyncclient-osgi</artifactId>
-            <version>4.1.3</version>
+            <artifactId>httpclient</artifactId>
+            <version>${apache.httpcomponents.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore-osgi</artifactId>
-            <version>${apache.httpcomponents.core.version}</version>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-- 
2.16.6