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:29 UTC
[1/3] incubator-slider git commit: SLIDER-655 cull module refs to
app-package entries that the toplevel slider project shouldn't be building
Repository: incubator-slider
Updated Branches:
refs/heads/develop 3ade6dd75 -> d73e7e10c
SLIDER-655 cull module refs to app-package entries that the toplevel slider project shouldn't be building
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a147d73b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a147d73b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a147d73b
Branch: refs/heads/develop
Commit: a147d73b564761b185f5087d22884441e0ab8746
Parents: 54e09f9
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 18:24:27 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 3 18:24:27 2014 +0000
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a147d73b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 869a090..9774c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1359,9 +1359,11 @@
</os>
</activation>
<modules>
+<!--
<module>app-packages/accumulo</module>
<module>app-packages/hbase</module>
<module>app-packages/storm</module>
+-->
</modules>
</profile>
@@ -1373,8 +1375,10 @@
</os>
</activation>
<modules>
+<!--
<module>app-packages/hbase-win</module>
<module>app-packages/storm-win</module>
+-->
</modules>
</profile>
<profile>
[3/3] incubator-slider git commit: Merge branch
'feature/SLIDER-671-mvn-publish' into develop
Posted by st...@apache.org.
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>
-
+
[2/3] incubator-slider git commit: SLIDER-655 fixup app-package/pom
to select different modules based on platform
Posted by st...@apache.org.
SLIDER-655 fixup app-package/pom to select different modules based on platform
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/3b1c2fa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3b1c2fa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3b1c2fa0
Branch: refs/heads/develop
Commit: 3b1c2fa00f7d007a52f2b8aee7b3e9431ffe565a
Parents: a147d73
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 18:28:13 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 3 18:28:13 2014 +0000
----------------------------------------------------------------------
app-packages/pom.xml | 42 ++++++++++++++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3b1c2fa0/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index b02b79c..2dbbccf 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -21,26 +21,52 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
<packaging>pom</packaging>
- <name>Slider Storm App Package</name>
- <description>Slider Storm App Packages: Zip files containing applications that slider can deploy</description>
+ <name>Slider App Packages</name>
+ <description>Slider App Packages: Zip files containing applications that slider can deploy</description>
<modules>
- <module>hbase</module>
- <module>accumulo</module>
- <module>storm</module>
+
</modules>
<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>
\ No newline at end of file