diff options
author | 2017-04-12 17:14:43 +0000 | |
---|---|---|
committer | 2017-04-12 17:14:43 +0000 | |
commit | 028b30e6a8391077ed836a380e41e26991c3981d (patch) | |
tree | 027eb906017347be4ba6640ce2f950127791a877 | |
parent | 52b45c0fdb16f9fecff227c3c0e3ada4b3cf70fd (diff) | |
parent | 4cb7d42a16bcc09c14a45825ea7c30bc588689bf (diff) |
Merge "Fix assembly xmls for maven-assembly-plugin v2.2+"
-rwxr-xr-x | dblib/installer/pom.xml | 2 | ||||
-rwxr-xr-x | dblib/installer/src/assembly/assemble_installer_zip.xml | 2 | ||||
-rwxr-xr-x | dblib/installer/src/assembly/assemble_mvnrepo_zip.xml | 2 | ||||
-rwxr-xr-x | filters/installer/pom.xml | 2 | ||||
-rw-r--r-- | filters/installer/src/assembly/assemble_installer_zip.xml | 3 | ||||
-rw-r--r-- | filters/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 | ||||
-rwxr-xr-x | sli/installer/pom.xml | 2 | ||||
-rw-r--r-- | sli/installer/src/assembly/assemble_installer_zip.xml | 1 | ||||
-rw-r--r-- | sli/installer/src/assembly/assemble_mvnrepo_zip.xml | 5 | ||||
-rwxr-xr-x | sliPluginUtils/installer/pom.xml | 2 | ||||
-rw-r--r-- | sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml | 1 | ||||
-rw-r--r-- | sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 | ||||
-rwxr-xr-x | sliapi/installer/pom.xml | 2 | ||||
-rw-r--r-- | sliapi/installer/src/assembly/assemble_installer_zip.xml | 1 | ||||
-rw-r--r-- | sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 |
15 files changed, 26 insertions, 2 deletions
diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 7754962..08a92e1 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -59,6 +59,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -73,6 +74,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/dblib/installer/src/assembly/assemble_installer_zip.xml b/dblib/installer/src/assembly/assemble_installer_zip.xml index 4716c7a..a6a22a9 100755 --- a/dblib/installer/src/assembly/assemble_installer_zip.xml +++ b/dblib/installer/src/assembly/assemble_installer_zip.xml @@ -4,6 +4,8 @@ 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>bin</id> + <formats> <format>zip</format> </formats> diff --git a/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml b/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml index 92cd930..d96c9f4 100755 --- a/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -4,6 +4,8 @@ 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>bin</id> + <formats> <format>zip</format> </formats> diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index 231aaa2..be5fd81 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -59,6 +59,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -73,6 +74,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/filters/installer/src/assembly/assemble_installer_zip.xml b/filters/installer/src/assembly/assemble_installer_zip.xml index 728afca..3a5c5f6 100644 --- a/filters/installer/src/assembly/assemble_installer_zip.xml +++ b/filters/installer/src/assembly/assemble_installer_zip.xml @@ -25,6 +25,9 @@ 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>bin</id> + <formats> <format>zip</format> </formats> diff --git a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml b/filters/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..a9fca4d 100644 --- a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/filters/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>bin</id> <formats> <format>zip</format> </formats> diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 1f15d9e..d025100 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -70,6 +70,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -84,6 +85,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/sli/installer/src/assembly/assemble_installer_zip.xml b/sli/installer/src/assembly/assemble_installer_zip.xml index 728afca..85e2e1e 100644 --- a/sli/installer/src/assembly/assemble_installer_zip.xml +++ b/sli/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>bin</id> <formats> <format>zip</format> </formats> diff --git a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..38e6d47 100644 --- a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,8 +25,9 @@ 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"> - <formats> - <format>zip</format> + <id>bin</id> + <formats> + <format>zip</format> </formats> <!-- we want "system" and related files right at the root level diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 4ab6254..22bf1e7 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -60,6 +60,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -74,6 +75,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml b/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml index 728afca..85e2e1e 100644 --- a/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml +++ b/sliPluginUtils/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>bin</id> <formats> <format>zip</format> </formats> diff --git a/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml b/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..bf7805f 100644 --- a/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sliPluginUtils/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>bin</id> <formats> <format>zip</format> </formats> diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index ec54c3e..51a956a 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -59,6 +59,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -73,6 +74,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/sliapi/installer/src/assembly/assemble_installer_zip.xml b/sliapi/installer/src/assembly/assemble_installer_zip.xml index 728afca..85e2e1e 100644 --- a/sliapi/installer/src/assembly/assemble_installer_zip.xml +++ b/sliapi/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>bin</id> <formats> <format>zip</format> </formats> diff --git a/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml index f026c58..18700a1 100644 --- a/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sliapi/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>bin</id> <formats> <format>zip</format> </formats> |