Return-Path: 
 <commits-return-15560-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3C0C217A0E
	for <apmail-ambari-commits-archive@www.apache.org>;
 Mon, 23 Mar 2015 17:39:57 +0000 (UTC)
Received: (qmail 32683 invoked by uid 500); 23 Mar 2015 17:39:57 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 32654 invoked by uid 500); 23 Mar 2015 17:39:57 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 32645 invoked by uid 99); 23 Mar 2015 17:39:57 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2015 17:39:57 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id E3FF1E180B; Mon, 23 Mar 2015 17:39:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: abaranchuk@apache.org
To: commits@ambari.apache.org
Message-Id: <6f2eee11045c455199a5cdfa4ca2ee94@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-10114 - [WinTP2] Automatic Bootstrap Ambari
 Agent Create the bootstrap script dependencies archive at build time (fixed
 linux build)
Date: Mon, 23 Mar 2015 17:39:56 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/trunk 78eb54849 -> f54d75b8b


AMBARI-10114 - [WinTP2] Automatic Bootstrap Ambari Agent Create the bootstrap script dependencies archive at build time (fixed linux build)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f54d75b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f54d75b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f54d75b8

Branch: refs/heads/trunk
Commit: f54d75b8b2b0e5a747c49c34849e82cabc1c57fc
Parents: 78eb548
Author: Artem Baranchuk <abaranchuk@hortonworks.con>
Authored: Mon Mar 23 19:16:33 2015 +0200
Committer: Artem Baranchuk <abaranchuk@hortonworks.con>
Committed: Mon Mar 23 19:35:46 2015 +0200

----------------------------------------------------------------------
 ambari-server/pom.xml | 68 +++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f54d75b8/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 0ac21bf..18593bd 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -134,40 +134,17 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
+            <descriptor>${assemblydescriptor}</descriptor>
           </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
         <executions>
           <execution>
-            <id>bootstrap-zip</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <attach>false</attach>
-              <finalName>bootstrap</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <descriptors>
-                <descriptor>${assemblybootstrap}</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
             <id>build-tarball</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
-            <configuration>
-              <attach>false</attach>
-              <appendAssemblyId>true</appendAssemblyId>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <descriptors>
-                <descriptor>${assemblydescriptor}</descriptor>
-              </descriptors>
-            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -1338,6 +1315,47 @@
       <build>
         <plugins>
           <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <configuration>
+              <descriptors>
+                <descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <id>bootstrap-zip</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <attach>false</attach>
+                  <finalName>bootstrap</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                  <descriptors>
+                    <descriptor>${assemblybootstrap}</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+              <execution>
+                <id>build-tarball</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <attach>false</attach>
+                  <appendAssemblyId>true</appendAssemblyId>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                  <descriptors>
+                    <descriptor>${assemblydescriptor}</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
             <version>1.2</version>