Code Review / sdnc / plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 4f070a8)
fix maven local build issue 59/3959/1
authorGuo Ruijing <ruijing.guo@intel.com>
Sun, 7 May 2017 20:16:41 +0000 (20:16 +0000)
committerGuo Ruijing <ruijing.guo@intel.com>
Sun, 7 May 2017 20:19:42 +0000 (20:19 +0000)
onap jenkins use maven-assembly-plugin 2.2-beta-5. without fix, local build use
maven-assembly-plugin 2.4.1 and build fails as:
Assembly is incorrectly configured: null.

to fix local build issue:
1. update to maven-assembly-plugin 2.6
2. add AssemblyId configuration which is needed for assembly >= 2.2

Change-Id: Ic14c86c5164157c312df5ef85272f123fde9217d
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
properties-node/installer/pom.xml patch | blob | history
properties-node/installer/src/assembly/assemble_installer_zip.xml patch | blob | history
properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml patch | blob | history
restapi-call-node/installer/pom.xml patch | blob | history
restapi-call-node/installer/src/assembly/assemble_installer_zip.xml patch | blob | history
restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml patch | blob | history

diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml
index 0f6d623..12c0a1b 100755 (executable)
--- a/properties-node/installer/pom.xml
+++ b/properties-node/installer/pom.xml
@@ -46,6 +46,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -59,6 +60,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -73,6 +75,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
diff --git a/properties-node/installer/src/assembly/assemble_installer_zip.xml b/properties-node/installer/src/assembly/assemble_installer_zip.xml
index f613d33..10b53b9 100644 (file)
--- a/properties-node/installer/src/assembly/assemble_installer_zip.xml
+++ b/properties-node/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">
+       <id>installer_zip</id>
        <formats>
                <format>zip</format>
        </formats>
diff --git a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index 27df272..6542ce0 100644 (file)
--- a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/properties-node/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">
+       <id>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>
diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index d168694..a1578ff 100755 (executable)
--- a/restapi-call-node/installer/pom.xml
+++ b/restapi-call-node/installer/pom.xml
@@ -46,6 +46,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -59,6 +60,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -73,6 +75,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>
diff --git a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml b/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
index f613d33..10b53b9 100644 (file)
--- a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
+++ b/restapi-call-node/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">
+       <id>installer_zip</id>
        <formats>
                <format>zip</format>
        </formats>
diff --git a/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index 27df272..6542ce0 100644 (file)
--- a/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/restapi-call-node/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">
+       <id>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>