From e2b2138f05e9eaf3eb89f9a65859433cf79b9960 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Tue, 21 Aug 2018 11:29:49 -0400 Subject: Fix packaging of netbox-client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 --- 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 @@ org.onap.ccsdk.parent odlparent-lite 1.1.0-SNAPSHOT - + org.onap.ccsdk.sli.adaptors @@ -33,10 +33,9 @@ ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} - sdnc-netbox-client + ccsdk-netbox-client ${application.name} - mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features - + mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features false @@ -61,6 +60,7 @@ netbox-client-provider ${project.version} + @@ -76,12 +76,12 @@ package - false + true stage/${application.name}-${project.version} src/assembly/assemble_mvnrepo_zip.xml - false + true @@ -120,7 +120,7 @@ true false false - org.onap.ccsdk.sli.core,org.opendaylight + org.onap.ccsdk.sli.adaptors provided 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"> - mvnrepo_zip + repo zip 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 @@ ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} + com.google.code.gson gson @@ -41,18 +42,18 @@ org.apache.httpcomponents - httpclient-osgi - ${apache.httpcomponents.client.version} + httpcore + ${apache.httpcomponents.core.version} org.apache.httpcomponents - httpasyncclient-osgi - 4.1.3 + httpclient + ${apache.httpcomponents.client.version} org.apache.httpcomponents - httpcore-osgi - ${apache.httpcomponents.core.version} + httpasyncclient + 4.1.1 org.slf4j -- cgit 1.2.3-korg