From 6bc4f7858fe857ce34ef7edc293c8da748285c46 Mon Sep 17 00:00:00 2001
From: Anton Korneta <akorneta@redhat.com>
Date: Mon, 14 Aug 2017 16:30:46 +0300
Subject: [PATCH] Fix build

Sometimes build failed with the following logs:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-assembly-plugin:2.6:single (make-assembly) on project assembly-main:
        Failed to create assembly: Error creating assembly archive tomcat-zip: Problem creating zip: Execution exception: Truncated TAR archive -> [Help 1]
---
 assembly/assembly-main/pom.xml                   | 2 +-
 assembly/assembly-main/src/assembly/assembly.xml | 3 +--
 pom.xml                                          | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml
index 9ffd9e02d4..002d4859e4 100644
--- a/assembly/assembly-main/pom.xml
+++ b/assembly/assembly-main/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.eclipse.che</groupId>
             <artifactId>bootstrapper</artifactId>
-            <type>tar.gz</type>
+            <type>zip</type>
             <classifier>linux_amd64</classifier>
         </dependency>
         <dependency>
diff --git a/assembly/assembly-main/src/assembly/assembly.xml b/assembly/assembly-main/src/assembly/assembly.xml
index 452b262948..b07333ae36 100644
--- a/assembly/assembly-main/src/assembly/assembly.xml
+++ b/assembly/assembly-main/src/assembly/assembly.xml
@@ -86,9 +86,8 @@
             <useProjectArtifact>false</useProjectArtifact>
             <unpack>true</unpack>
             <outputDirectory>lib/linux_amd64</outputDirectory>
-            <outputFileNameMapping>bootstrapper-linux_amd64</outputFileNameMapping>
             <includes>
-                <include>org.eclipse.che:bootstrapper:tar.gz:linux_amd64</include>
+                <include>org.eclipse.che:bootstrapper:zip:linux_amd64</include>
             </includes>
         </dependencySet>
         <dependencySet>
diff --git a/pom.xml b/pom.xml
index 8112b37b53..6b1fe9cc6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,13 @@
                 <type>tar.gz</type>
                 <classifier>linux_amd64</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che</groupId>
+                <artifactId>bootstrapper</artifactId>
+                <version>${che.version}</version>
+                <type>zip</type>
+                <classifier>linux_amd64</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che</groupId>
                 <artifactId>exec-agent</artifactId>