You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2015/10/07 02:05:50 UTC
incubator-asterixdb git commit: ASTERIXDB-1120: Fix sub-project
builds.
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master 231c24d19 -> 79dfcfcd7
ASTERIXDB-1120: Fix sub-project builds.
The maven-assembly-plugin configuration for creating source tarballs was
interfering with building in a subdirectory. Since we only need tarballs
at release time, move this plugin to a new 'asterix-release' profile.
Change-Id: I457c1700459741158a245f20a9ab2adfc79731d2
Reviewed-on: https://asterix-gerrit.ics.uci.edu/431
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <im...@apache.org>
Tested-by: Chris Hillery <ce...@lambda.nu>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/79dfcfcd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/79dfcfcd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/79dfcfcd
Branch: refs/heads/master
Commit: 79dfcfcd737db8702f32afcf28a3203e7a315e19
Parents: 231c24d
Author: Chris Hillery <ch...@lambda.nu>
Authored: Fri Oct 2 17:14:25 2015 -0700
Committer: Chris Hillery <ce...@lambda.nu>
Committed: Tue Oct 6 15:10:48 2015 -0700
----------------------------------------------------------------------
pom.xml | 58 ++++++++++++++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/79dfcfcd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8d11476..06fd841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,31 +146,6 @@
</includes>
</configuration>
</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>
</plugins>
</build>
@@ -237,7 +212,38 @@
<test.heap.size>3072</test.heap.size>
</properties>
</profile>
-
+ <profile>
+ <id>asterix-release</id>
+ <build>
+ <plugins>
+ <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>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<modules>