summaryrefslogtreecommitdiffstats
path: root/netbox-client/installer
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2018-08-21 11:29:49 -0400
committerAlexis de Talhouët <adetalhouet89@gmail.com>2018-08-24 08:42:14 -0400
commite2b2138f05e9eaf3eb89f9a65859433cf79b9960 (patch)
tree6c01fa6b1d1fee1cbd28786dea462c6d4937fd35 /netbox-client/installer
parenteae6b96f6529e4a9f350809a5def4d82a904501b (diff)
Fix packaging of netbox-client
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>
Diffstat (limited to 'netbox-client/installer')
-rwxr-xr-xnetbox-client/installer/pom.xml14
-rw-r--r--netbox-client/installer/src/assembly/assemble_mvnrepo_zip.xml2
2 files changed, 8 insertions, 8 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>