Merge "fix maven local build issue"

diff --combined asdcApi/installer/src/assembly/assemble_installer_zip.xml
index f613d33,1bb0d08..10b53b9
--- 1/asdcApi/installer/src/assembly/assemble_installer_zip.xml
--- 2/asdcApi/installer/src/assembly/assemble_installer_zip.xml
+++ b/asdcApi/installer/src/assembly/assemble_installer_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>installer_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
index 93dcf16,4924402..f1eee4a
--- 1/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
--- 2/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined dataChange/installer/src/assembly/assemble_installer_zip.xml
index f613d33,1bb0d08..10b53b9
--- 1/dataChange/installer/src/assembly/assemble_installer_zip.xml
--- 2/dataChange/installer/src/assembly/assemble_installer_zip.xml
+++ b/dataChange/installer/src/assembly/assemble_installer_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>installer_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
index 93dcf16,4924402..f1eee4a
--- 1/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
--- 2/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined dmaap-listener/src/assembly/assemble_zip.xml
index 3dadc84,bd0cdd5..e8adf4b
--- 1/dmaap-listener/src/assembly/assemble_zip.xml
--- 2/dmaap-listener/src/assembly/assemble_zip.xml
+++ b/dmaap-listener/src/assembly/assemble_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -23,6 -23,7 +23,7 @@@
        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>assemble_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined ueb-listener/src/assembly/assemble_zip.xml
index a72be47,d18a0a4..ca89fc1
--- 1/ueb-listener/src/assembly/assemble_zip.xml
--- 2/ueb-listener/src/assembly/assemble_zip.xml
+++ b/ueb-listener/src/assembly/assemble_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>assemble_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined vnftools/installer/src/assembly/assemble_installer_zip.xml
index f613d33,1bb0d08..10b53b9
--- 1/vnftools/installer/src/assembly/assemble_installer_zip.xml
--- 2/vnftools/installer/src/assembly/assemble_installer_zip.xml
+++ b/vnftools/installer/src/assembly/assemble_installer_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>installer_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --combined vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
index 27df272,6eb4554..6542ce0
--- 1/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
--- 2/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
@@@ -3,7 -3,7 +3,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.
@@@ -25,6 -25,7 +25,7 @@@
        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>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>