diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-04-21 16:14:18 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-04-21 16:14:18 -0400 |
| commit | 328d71305e529887d78bec5d028d54feaea737c1 (patch) | |
| tree | 9c571511c9c7f402a84cac82cc41cee9f4e091cc /resource-assignment/installer | |
| parent | ec0f99bdd24468c1f662d6fcf6e2ca29b678da73 (diff) | |
[SDNC-5] Rebase SDN-C adaptors
Apply latest bug fixes, enhancements and port to OpenDaylight Boron.
Change-Id: Ia7d29986eb12f98edbf075dae3cc9343af6791b6
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'resource-assignment/installer')
4 files changed, 1 insertions, 5 deletions
diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml index 80657e3..7e3dd8c 100755 --- a/resource-assignment/installer/pom.xml +++ b/resource-assignment/installer/pom.xml @@ -58,7 +58,6 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> - <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -73,7 +72,6 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> - <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/resource-assignment/installer/src/assembly/assemble_installer_zip.xml b/resource-assignment/installer/src/assembly/assemble_installer_zip.xml index 85e2e1e..728afca 100644 --- a/resource-assignment/installer/src/assembly/assemble_installer_zip.xml +++ b/resource-assignment/installer/src/assembly/assemble_installer_zip.xml @@ -25,7 +25,6 @@ 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>bin</id> <formats> <format>zip</format> </formats> diff --git a/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml b/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml index bf7805f..c14f8ae 100644 --- a/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,7 +25,6 @@ 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>bin</id> <formats> <format>zip</format> </formats> diff --git a/resource-assignment/installer/src/main/resources/scripts/install-feature.sh b/resource-assignment/installer/src/main/resources/scripts/install-feature.sh index 33e9b03..93236c5 100644 --- a/resource-assignment/installer/src/main/resources/scripts/install-feature.sh +++ b/resource-assignment/installer/src/main/resources/scripts/install-feature.sh @@ -5,7 +5,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |