asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject incubator-asterixdb-hyracks git commit: ASTERIXDB-1120: Fix sub-project builds.
Date Wed, 07 Oct 2015 00:06:39 GMT
Repository: incubator-asterixdb-hyracks
Updated Branches:
  refs/heads/master 9c569a23d -> 1fda6bc36


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.
(Use same name as asterix project in preparation for merging of the projects.)

Change-Id: Ia42ccd27a9882ac8a27ce1d17c9d71c9ad5505b6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/432
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <imaxon@apache.org>
Tested-by: Chris Hillery <ceej@lambda.nu>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/1fda6bc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/1fda6bc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/1fda6bc3

Branch: refs/heads/master
Commit: 1fda6bc3665ceb6deec405865b8aa110719505cc
Parents: 9c569a2
Author: Chris Hillery <chillery@lambda.nu>
Authored: Fri Oct 2 17:18:11 2015 -0700
Committer: Chris Hillery <ceej@lambda.nu>
Committed: Tue Oct 6 15:03:51 2015 -0700

----------------------------------------------------------------------
 pom.xml | 57 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/1fda6bc3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0f097f..8e4aeec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,31 +192,6 @@
           </excludes>
 	</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>
 
@@ -235,6 +210,38 @@
         <hanging.pregelix.tests />
       </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>
 
   <repositories>


Mime
View raw message