From c8a9ad49965b6152a0c7f3f4b7d1f7993d52f082 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 7 Apr 2017 12:22:23 -0700 Subject: Fix assembly xmls for maven-assembly-plugin v2.2+ Starting in version 2.2, maven-assembly-plugin requires an id tag in the assembly descriptor xmls. This patch allows the project to be built in environments that use newer versions of maven-assembly-plugin. For details, see: https://issues.apache.org/jira/browse/MASSEMBLY-517 Change-Id: I3a721da4aa47be58127fa3f8971f01635d400185 Signed-off-by: Gary Wu --- dataChange/installer/pom.xml | 2 ++ dataChange/installer/src/assembly/assemble_installer_zip.xml | 1 + dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + 3 files changed, 4 insertions(+) (limited to 'dataChange/installer') diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml index 7ab32092..0eeea7aa 100755 --- a/dataChange/installer/pom.xml +++ b/dataChange/installer/pom.xml @@ -60,6 +60,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +75,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 728afca5..85e2e1e8 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"> + bin zip diff --git a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml index b4d2d61a..73afa1c1 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"> + bin zip -- cgit 1.2.3-korg