Repository: incubator-slider Updated Branches: refs/heads/develop 6da903d81 -> c9b47f11c
SLIDER-537. Cleanup the top level pom file (Ashish Singh via smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/41541865 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/41541865 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/41541865 Branch: refs/heads/develop Commit: 4154186544f4f06d470042cdc523f812888d4365 Parents: 6da903d Author: Sumit Mohanty <[email protected]> Authored: Fri Oct 17 17:28:51 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Oct 17 17:28:51 2014 -0700 ---------------------------------------------------------------------- app-packages/hbase-win/appConfig-default.json | 2 +- app-packages/hbase-win/pom.xml | 5 +--- app-packages/hbase/appConfig-default.json | 2 +- app-packages/hbase/pom.xml | 6 +---- app-packages/storm/pom.xml | 1 + pom.xml | 30 +++++++++++++++++++--- 6 files changed, 32 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase-win/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json index e82a65f..a802fed 100644 --- a/app-packages/hbase-win/appConfig-default.json +++ b/app-packages/hbase-win/appConfig-default.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${bld.version}.zip", + "application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${pkg.version}.zip", "create.default.zookeeper.node": "true", "java_home": "C:\\java", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase-win/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml index ad5855e..2df22ee 100644 --- a/app-packages/hbase-win/pom.xml +++ b/app-packages/hbase-win/pom.xml @@ -28,7 +28,7 @@ <packaging>pom</packaging> <name>Slider HBase App Package for Windows</name> <description>Slider HBase App Package for Windows</description> - <version>${bld.version}</version> + <version>${pkg.version}</version> <properties> <work.dir>package-tmp</work.dir> <app.package.name>${project.artifactId}-${project.version}</app.package.name> @@ -37,9 +37,6 @@ <profiles> <profile> <id>hbase-app-package-win</id> - <properties> - <bld.version>${pkg.version}</bld.version> - </properties> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json index ffd964d..7746fc0 100644 --- a/app-packages/hbase/appConfig-default.json +++ b/app-packages/hbase/appConfig-default.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": ".slider/package/HBASE/slider-hbase-app-package-${bld.version}.zip", + "application.def": ".slider/package/HBASE/slider-hbase-app-package-${pkg.version}.zip", "create.default.zookeeper.node": "true", "java_home": "/usr/jdk64/jdk1.7.0_67", "system_configs": "core-site", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml index be1b858..f80346a 100644 --- a/app-packages/hbase/pom.xml +++ b/app-packages/hbase/pom.xml @@ -28,7 +28,7 @@ <packaging>pom</packaging> <name>Slider HBase App Package</name> <description>Slider HBase App Package</description> - <version>${bld.version}</version> + <version>${pkg.version}</version> <properties> <work.dir>package-tmp</work.dir> <app.package.name>${project.artifactId}-${project.version}</app.package.name> @@ -37,9 +37,6 @@ <profiles> <profile> <id>hbase-app-package</id> - <properties> - <bld.version>${pkg.version}</bld.version> - </properties> <build> <plugins> <plugin> @@ -87,7 +84,6 @@ <id>hbase-app-package-it</id> <properties> <pkg.version>${hbase.version}</pkg.version> - <bld.version>0.51.0-incubating-SNAPSHOT</bld.version> <pkg.src>${project.build.directory}/${work.dir}</pkg.src> <pkg.name>hbase-${hbase.version}-bin.tar.gz</pkg.name> </properties> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/storm/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml index c08ed3d..b8e558f 100644 --- a/app-packages/storm/pom.xml +++ b/app-packages/storm/pom.xml @@ -21,6 +21,7 @@ <groupId>org.apache.slider</groupId> <artifactId>slider</artifactId> <version>0.51.0-incubating-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>slider-storm-app-package</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e15632e..77faa64 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ -<!-- + <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -38,8 +38,6 @@ <module>app-packages/command-logger/slider-pkg</module> <module>slider-core</module> <module>slider-agent</module> - <module>app-packages/accumulo</module> - <module>app-packages/hbase</module> <module>slider-assembly</module> <module>slider-funtest</module> <module>slider-providers/hbase/slider-hbase-provider</module> @@ -1248,6 +1246,32 @@ <profiles> <profile> + <id>linux</id> + <activation> + <os> + <family>linux</family> + </os> + </activation> + <modules> + <module>app-packages/accumulo</module> + <module>app-packages/hbase</module> + <module>app-packages/storm</module> + </modules> + </profile> + <profile> + <id>Windows</id> + <activation> + <os> + <name>Windows XP</name> + <family>Windows</family> + </os> + </activation> + <modules> + <module>app-packages/hbase-win</module> + <module>app-packages/storm-win</module> + </modules> + </profile> + <profile> <id>rat</id> <build> <plugins>
