diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-02-28 21:13:09 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-02-28 21:13:09 -0500 |
| commit | 131f1fab6bea5eeb6467e8836ec00ef7c6bf5eac (patch) | |
| tree | 6bab70fa7c38622c76a0384a9dd348daa80b1ab5 /vnfapi/installer | |
| parent | 2db328c6cd234acdfc836c995876ef12a43dc7f5 (diff) | |
Nitrogen port : sdnc-northbound
Update sdnc/northbound to OpenDaylight Nitrogen release.
Change-Id: I6e299418a7ab441899b78b5d3df5f8ee96829222
Issue-ID: SDNC-269
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'vnfapi/installer')
| -rwxr-xr-x | vnfapi/installer/pom.xml | 33 | ||||
| -rw-r--r-- | vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml | 6 |
2 files changed, 18 insertions, 21 deletions
diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index a3fc6350..2257be33 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -1,31 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>vnfapi</artifactId> - <groupId>org.onap.sdnc.northbound</groupId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> </parent> + + <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnfapi-installer</artifactId> - <name>VNF API - Karaf Installer</name> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> + <properties> <application.name>sdnc-vnfapi</application.name> - <features.boot>sdnc-vnfapi</features.boot> - <features.repositories>mvn:org.onap.sdnc.northbound/vnfapi-features/${project.version}/xml/features</features.repositories> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> <dependencies> <dependency> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>vnfapi-features</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>${application.name}</artifactId> <version>${project.version}</version> - <classifier>features</classifier> <type>xml</type> + <classifier>features</classifier> <exclusions> <exclusion> <groupId>*</groupId> @@ -35,7 +40,7 @@ </dependency> <dependency> - <groupId>org.onap.sdnc.northbound</groupId> + <groupId>${project.groupId}</groupId> <artifactId>vnfapi-provider</artifactId> <version>${project.version}</version> </dependency> @@ -100,8 +105,7 @@ <useRepositoryLayout>true</useRepositoryLayout> <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> - <includeGroupIds>org.onap.sdnc</includeGroupIds> - <excludeArtifactIds>sli-common,sli-provider,dblib-common,dblib-provider</excludeArtifactIds> + <includeGroupIds>org.onap.sdnc.northbound</includeGroupIds> <scope>provided</scope> </configuration> </execution> @@ -136,5 +140,4 @@ </plugins> </build> - </project> diff --git a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml index 0612e6ed..bfb308e2 100644 --- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -42,12 +42,6 @@ </fileSet> </fileSets> - <files> - <file> - <source>../model/target/vnfapi.properties</source> - <destName>./configuration/vnfapi.properties</destName> - </file> - </files> </assembly> |