diff options
Diffstat (limited to 'mdsal-resource/installer')
| -rwxr-xr-x | mdsal-resource/installer/pom.xml | 30 | ||||
| -rw-r--r-- | mdsal-resource/installer/src/main/resources/scripts/install-feature.sh | 9 |
2 files changed, 21 insertions, 18 deletions
diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml index 9f4027b03..934492260 100755 --- a/mdsal-resource/installer/pom.xml +++ b/mdsal-resource/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"> +<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>mdsal-resource</artifactId> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <version>0.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> + + <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource-installer</artifactId> - <name>MDSAL Resource - Karaf Installer</name> + <version>0.2.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> + <properties> - <application.name>sdnc-mdsal-resource</application.name> - <features.boot>sdnc-mdsal-resource</features.boot> - <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/mdsal-resource-features/${project.version}/xml/features</features.repositories> + <application.name>ccsdk-mdsal-resource</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${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.adaptors</groupId> - <artifactId>mdsal-resource-features</artifactId> + <artifactId>ccsdk-mdsal-resource</artifactId> <version>${project.version}</version> - <classifier>features</classifier> <type>xml</type> + <classifier>features</classifier> <exclusions> <exclusion> <groupId>*</groupId> @@ -98,8 +104,7 @@ <useRepositoryLayout>true</useRepositoryLayout> <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk</includeGroupIds> - <excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds> + <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds> <scope>provided</scope> </configuration> </execution> @@ -134,5 +139,4 @@ </plugins> </build> - </project> diff --git a/mdsal-resource/installer/src/main/resources/scripts/install-feature.sh b/mdsal-resource/installer/src/main/resources/scripts/install-feature.sh index df03392c8..0eab001d5 100644 --- a/mdsal-resource/installer/src/main/resources/scripts/install-feature.sh +++ b/mdsal-resource/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} |