You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/03/23 18:39:56 UTC
ambari git commit: AMBARI-10114 - [WinTP2] Automatic Bootstrap Ambari
Agent Create the bootstrap script dependencies archive at build time (fixed
linux build)
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 <ab...@hortonworks.con>
Authored: Mon Mar 23 19:16:33 2015 +0200
Committer: Artem Baranchuk <ab...@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>