Merge "[BLACKDUCK] Fix blackduck config"
authorDavid Stilwell <stilwelld@att.com>
Thu, 18 May 2017 19:54:05 +0000 (19:54 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 18 May 2017 19:54:05 +0000 (19:54 +0000)
16 files changed:
asdcApi/installer/pom.xml
asdcApi/installer/src/assembly/assemble_installer_zip.xml
asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
dataChange/installer/pom.xml
dataChange/installer/src/assembly/assemble_installer_zip.xml
dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
dmaap-listener/pom.xml
dmaap-listener/src/assembly/assemble_zip.xml
ueb-listener/pom.xml
ueb-listener/src/assembly/assemble_zip.xml
vnfapi/installer/pom.xml
vnfapi/installer/src/assembly/assemble_installer_zip.xml
vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
vnftools/installer/pom.xml
vnftools/installer/src/assembly/assemble_installer_zip.xml
vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml

index ced3c3d..f97c537 100755 (executable)
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
index f613d33..10b53b9 100644 (file)
@@ -25,6 +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>
index 93dcf16..f1eee4a 100644 (file)
@@ -25,6 +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>
index 5b8462d..adc2d14 100755 (executable)
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
index f613d33..10b53b9 100644 (file)
@@ -25,6 +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>
index 93dcf16..f1eee4a 100644 (file)
@@ -25,6 +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>
index 58d23ae..944ca86 100755 (executable)
@@ -88,6 +88,7 @@
 
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
index 3dadc84..e8adf4b 100644 (file)
@@ -23,6 +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>
index eda454c..23ebd53 100755 (executable)
 
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
index a72be47..ca89fc1 100644 (file)
@@ -25,6 +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>
index 3fa0ac7..3fd9885 100755 (executable)
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
index c7fb0c1..13156fd 100644 (file)
@@ -23,6 +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>installer_zip</id>
     <formats>
         <format>zip</format>
     </formats>
index b37b3f1..162ce10 100644 (file)
@@ -23,6 +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>mvnrepo_zip</id>
     <formats>
         <format>zip</format>
     </formats>
index 9138fe0..c3436f7 100755 (executable)
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
index f613d33..10b53b9 100644 (file)
@@ -25,6 +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>
index 27df272..6542ce0 100644 (file)
@@ -25,6 +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>