diff options
Diffstat (limited to 'asdcApi/installer')
| -rwxr-xr-x | asdcApi/installer/pom.xml | 32 | ||||
| -rw-r--r-- | asdcApi/installer/src/main/resources/scripts/install-feature.sh | 9 |
2 files changed, 24 insertions, 17 deletions
diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml index 1b7666935..aac236bde 100755 --- a/asdcApi/installer/pom.xml +++ b/asdcApi/installer/pom.xml @@ -1,19 +1,25 @@ <?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"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>asdcApi</artifactId> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <version>0.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath/> </parent> + + <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> - <name>asdcApi - Karaf Installer</name> + <version>0.2.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> + <properties> - <application.name>sdnc-asdcApi</application.name> - <features.boot>sdnc-asdcApi</features.boot> - <features.repositories>mvn:org.onap.ccsdk.sli.northbound/asdcApi-features/${project.version}/xml/features</features.repositories> + <application.name>ccsdk-asdcApi</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> @@ -21,10 +27,10 @@ <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>asdcApi-features</artifactId> + <artifactId>${application.name}</artifactId> <version>${project.version}</version> - <classifier>features</classifier> <type>xml</type> + <classifier>features</classifier> <exclusions> <exclusion> <groupId>*</groupId> @@ -32,7 +38,11 @@ </exclusion> </exclusions> </dependency> - + <dependency> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>asdcApi-model</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-provider</artifactId> @@ -100,7 +110,6 @@ <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds> - <excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds> <scope>provided</scope> </configuration> </execution> @@ -135,5 +144,4 @@ </plugins> </build> - </project> diff --git a/asdcApi/installer/src/main/resources/scripts/install-feature.sh b/asdcApi/installer/src/main/resources/scripts/install-feature.sh index e986764b9..cee4a4952 100644 --- a/asdcApi/installer/src/main/resources/scripts/install-feature.sh +++ b/asdcApi/installer/src/main/resources/scripts/install-feature.sh @@ -10,9 +10,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,6 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -36,5 +35,5 @@ else exit 1 fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} |