You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2016/05/16 07:08:35 UTC
incubator-asterixdb git commit: Run Assembly Plugin Only When
Assembly Defined
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master fba622b3a -> 1e34ec2ea
Run Assembly Plugin Only When Assembly Defined
Enable incremental builds in hyracks by only gating assembly under a
file-presence activation profile.
Change-Id: I97268a79f89b043a9b9b32ef195012a928f5ba9f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/851
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/1e34ec2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/1e34ec2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/1e34ec2e
Branch: refs/heads/master
Commit: 1e34ec2eac0f5b614d17c94be6982a68980a84ca
Parents: fba622b
Author: Michael Blow <mb...@apache.org>
Authored: Sun May 15 19:15:40 2016 -0700
Committer: Michael Blow <mi...@couchbase.com>
Committed: Mon May 16 00:08:32 2016 -0700
----------------------------------------------------------------------
asterixdb/pom.xml | 5 +++++
hyracks-fullstack/pom.xml | 30 +++++-------------------------
2 files changed, 10 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1e34ec2e/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index d0e5c40..676683e 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -344,6 +344,11 @@
</profile>
<profile>
<id>asterix-release</id>
+ <activation>
+ <file>
+ <exists>src/main/assembly/source.xml</exists>
+ </file>
+ </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/1e34ec2e/hyracks-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 513bb80..7699520 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -237,31 +237,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- We override the configuration plugin to override the descriptor to use for building
- the source release zip. Specifically, we would like to control the inclusions/exclusions.
- For example, we exclude the KEYS file from the zip -->
- <executions>
- <execution>
- <!-- Use this id to match the id mentioned in the assembly plugin configuration in
- the apache parent POM under the apache-release profile -->
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <!-- combine.self should be override to replace the configuration in the parent POM -->
- <configuration combine.self="override">
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptors>
- <descriptor>src/main/assembly/source.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
@@ -357,6 +332,11 @@
</profile>
<profile>
<id>asterix-release</id>
+ <activation>
+ <file>
+ <exists>src/main/assembly/source.xml</exists>
+ </file>
+ </activation>
<build>
<plugins>
<plugin>