From: David Stilwell Date: Thu, 18 May 2017 19:54:05 +0000 (+0000) Subject: Merge "[BLACKDUCK] Fix blackduck config" X-Git-Tag: v1.2.1~56 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=12674fce55a196ff42946023f78143398f7cced4;hp=42f04c1643ffdf62bad4aeeaca6e5a98280bb85e;p=sdnc%2Fnorthbound.git Merge "[BLACKDUCK] Fix blackduck config" --- diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml index ced3c3da..f97c537c 100755 --- a/asdcApi/installer/pom.xml +++ b/asdcApi/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/asdcApi/installer/src/assembly/assemble_installer_zip.xml b/asdcApi/installer/src/assembly/assemble_installer_zip.xml index f613d331..10b53b93 100644 --- a/asdcApi/installer/src/assembly/assemble_installer_zip.xml +++ b/asdcApi/installer/src/assembly/assemble_installer_zip.xml @@ -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"> + installer_zip zip diff --git a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml index 93dcf166..f1eee4ad 100644 --- a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -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"> + mvnrepo_zip zip diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml index 5b8462db..adc2d147 100755 --- a/dataChange/installer/pom.xml +++ b/dataChange/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/dataChange/installer/src/assembly/assemble_installer_zip.xml b/dataChange/installer/src/assembly/assemble_installer_zip.xml index f613d331..10b53b93 100644 --- a/dataChange/installer/src/assembly/assemble_installer_zip.xml +++ b/dataChange/installer/src/assembly/assemble_installer_zip.xml @@ -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"> + installer_zip zip diff --git a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml index 93dcf166..f1eee4ad 100644 --- a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -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"> + mvnrepo_zip zip diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index 58d23ae2..944ca86d 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -88,6 +88,7 @@ maven-assembly-plugin + 2.6 create-zip @@ -102,6 +103,7 @@ src/assembly/assemble_zip.xml + false diff --git a/dmaap-listener/src/assembly/assemble_zip.xml b/dmaap-listener/src/assembly/assemble_zip.xml index 3dadc84f..e8adf4b3 100644 --- a/dmaap-listener/src/assembly/assemble_zip.xml +++ b/dmaap-listener/src/assembly/assemble_zip.xml @@ -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"> + assemble_zip zip diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml index eda454cf..23ebd531 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -101,6 +101,7 @@ maven-assembly-plugin + 2.6 create-zip @@ -115,6 +116,7 @@ src/assembly/assemble_zip.xml + false diff --git a/ueb-listener/src/assembly/assemble_zip.xml b/ueb-listener/src/assembly/assemble_zip.xml index a72be47b..ca89fc1f 100644 --- a/ueb-listener/src/assembly/assemble_zip.xml +++ b/ueb-listener/src/assembly/assemble_zip.xml @@ -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"> + assemble_zip zip diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index 3fa0ac74..3fd98851 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/vnfapi/installer/src/assembly/assemble_installer_zip.xml b/vnfapi/installer/src/assembly/assemble_installer_zip.xml index c7fb0c16..13156fda 100644 --- a/vnfapi/installer/src/assembly/assemble_installer_zip.xml +++ b/vnfapi/installer/src/assembly/assemble_installer_zip.xml @@ -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"> + installer_zip zip diff --git a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml index b37b3f19..162ce109 100644 --- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -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"> + mvnrepo_zip zip diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 9138fe0e..c3436f78 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/vnftools/installer/src/assembly/assemble_installer_zip.xml b/vnftools/installer/src/assembly/assemble_installer_zip.xml index f613d331..10b53b93 100644 --- a/vnftools/installer/src/assembly/assemble_installer_zip.xml +++ b/vnftools/installer/src/assembly/assemble_installer_zip.xml @@ -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"> + installer_zip zip diff --git a/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml index 27df272c..6542ce09 100644 --- a/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -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"> + mvnrepo_zip zip