summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-08-24 19:27:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-24 19:27:59 +0000
commitd7233c8b319c44728ffcb72c7a7576fa6a3ef372 (patch)
tree04d010eb915e31bfd8017e73f505485f7aeffddc
parent0c3904fd5e647882eeca370c5e2b2aa87f6636ad (diff)
parente2b2138f05e9eaf3eb89f9a65859433cf79b9960 (diff)
Merge "Fix packaging of netbox-client"
-rwxr-xr-xnetbox-client/installer/pom.xml14
-rw-r--r--netbox-client/installer/src/assembly/assemble_mvnrepo_zip.xml2
-rw-r--r--netbox-client/provider/pom.xml13
3 files changed, 15 insertions, 14 deletions
diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml
index 2e8680d93..04ab0ed72 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 4950f5277..b905cfe3f 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 16695f20b..2ffcaea9a 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>