diff options
author | Marcus Williams <marcus.williams@intel.com> | 2017-10-13 16:21:35 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-10-13 16:21:35 +0000 |
commit | 860a5ab886772dda6ae610c4c6ff1373fd22c563 (patch) | |
tree | 1bf22701084cf52567f4dc1a32c49b768c19127f /generic-resource-api/installer/src | |
parent | cb54816c725dccd5bcaddbe7230d53483d201915 (diff) | |
parent | 03575373024593fd1cac6812f0992152edde4d37 (diff) |
Merge "Fix installation issues with generic-resource-api"
Diffstat (limited to 'generic-resource-api/installer/src')
-rw-r--r-- | generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml b/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml index c1b6357f..89d9c14f 100644 --- a/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -1,21 +1,13 @@ -<!-- - ============LICENSE_START======================================================= - openECOMP : SDN-C - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. - ================================================================================ - 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. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - --> +<!-- ============LICENSE_START======================================================= + openECOMP : SDN-C ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ + 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. See the License for the specific + language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> <!-- Defines how we build the .zip file which is our distribution. --> @@ -28,9 +20,8 @@ <format>zip</format> </formats> - <!-- we want "system" and related files right at the root level - as this file is suppose to be unzip on top of a karaf - distro. --> + <!-- we want "system" and related files right at the root level as this + file is suppose to be unzip on top of a karaf distro. --> <includeBaseDirectory>false</includeBaseDirectory> <fileSets> @@ -44,14 +35,10 @@ <files> <file> - <source>../provider/src/main/resources/initial/${feature-name}-provider.xml</source> - <destName>./etc/opendaylight/karaf/200-${feature-name}-provider.xml</destName> - </file> - <file> - <source>../model/target/generic-resource-api.properties</source> - <destName>./configuration/generic-resource-api.properties</destName> + <source>../model/target/generic-resource-api.properties</source> + <destName>./configuration/generic-resource-api.properties</destName> - </file> + </file> </files> </assembly> |