You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ce...@apache.org on 2016/04/08 08:50:19 UTC
incubator-asterixdb git commit: Allow for optional modules in build.
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master e19ff29f9 -> db831a455
Allow for optional modules in build.
Change-Id: Ib99bfb3f92dfaa66dc2299db31b734adb5cceeca
Reviewed-on: https://asterix-gerrit.ics.uci.edu/768
Reviewed-by: Chris Hillery <ce...@lambda.nu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/db831a45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/db831a45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/db831a45
Branch: refs/heads/master
Commit: db831a455a2e8b13bfe33948a944964754307cb1
Parents: e19ff29
Author: Chris Hillery <ch...@lambda.nu>
Authored: Thu Apr 7 18:02:46 2016 -0700
Committer: Chris Hillery <ce...@lambda.nu>
Committed: Thu Apr 7 23:44:02 2016 -0700
----------------------------------------------------------------------
.gitignore | 3 +++
asterixdb/asterix-server/pom.xml | 19 +++++++++++++++++++
asterixdb/pom.xml | 11 +++++++++++
3 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/db831a45/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6453783..ced139e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,6 @@ tmp
dist
*.iml
.idea/
+asterixdb/asterix-opt
+*~
+
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/db831a45/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 43bb997..2238f58 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -50,6 +50,7 @@
${project.build.directory}/appassembler
</assembleDirectory>
<repositoryLayout>flat</repositoryLayout>
+ <useWildcardClassPath>true</useWildcardClassPath>
<programs>
<program>
<platforms>
@@ -128,6 +129,24 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>opt-modules</id>
+ <activation>
+ <file>
+ <exists>../asterix-opt/pom.xml</exists>
+ </file>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.asterix</groupId>
+ <artifactId>asterix-opt-bom</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.hyracks</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/db831a45/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 09cccb7..dd7a8b3 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -290,6 +290,17 @@
<profiles>
<profile>
+ <id>opt-modules</id>
+ <activation>
+ <file>
+ <exists>asterix-opt/pom.xml</exists>
+ </file>
+ </activation>
+ <modules>
+ <module>asterix-opt</module>
+ </modules>
+ </profile>
+ <profile>
<id>slow-aql-tests</id>
<properties>
<runSlowAQLTests>true</runSlowAQLTests>