You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/12/03 19:29:31 UTC
[3/3] incubator-slider git commit: Merge branch
'feature/SLIDER-671-mvn-publish' into develop
Merge branch 'feature/SLIDER-671-mvn-publish' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d73e7e10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d73e7e10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d73e7e10
Branch: refs/heads/develop
Commit: d73e7e10cecd877140299a2ecaf78e77f7287c44
Parents: 3ade6dd 3b1c2fa
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 18:29:19 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 3 18:29:19 2014 +0000
----------------------------------------------------------------------
app-packages/pom.xml | 40 +++++++++++++++++++++++++++++++++-------
pom.xml | 4 ++++
2 files changed, 37 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d73e7e10/app-packages/pom.xml
----------------------------------------------------------------------
diff --cc app-packages/pom.xml
index cb45e98,2dbbccf..7925cfb
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@@ -39,8 -37,36 +37,36 @@@
<build>
</build>
- <dependencies>
- </dependencies>
+ <profiles>
+
+ <profile>
+ <id>Non-Windows</id>
+ <activation>
+ <os>
+ <family>!windows</family>
+ </os>
+ </activation>
+ <modules>
+ <module>accumulo</module>
+ <module>hbase</module>
+ <module>storm</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>Windows</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <modules>
+ <module>hbase-win</module>
+ <module>storm-win</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
-
+