Updating the pom to hadoop versions with dashes in them. Parcels won't work with dashes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8fa45774 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8fa45774 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8fa45774 Branch: refs/heads/master Commit: 8fa45774810acaaf60d5d8bd79b07579de5b4591 Parents: 41ebecb Author: Aaron McCurry <amccu...@gmail.com> Authored: Wed Jan 6 10:42:32 2016 -0500 Committer: Aaron McCurry <amccu...@gmail.com> Committed: Wed Jan 6 10:42:32 2016 -0500 ---------------------------------------------------------------------- blur-hive/pom.xml | 4 ---- pom.xml | 9 +++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8fa45774/blur-hive/pom.xml ---------------------------------------------------------------------- diff --git a/blur-hive/pom.xml b/blur-hive/pom.xml index 33618fc..16316ef 100644 --- a/blur-hive/pom.xml +++ b/blur-hive/pom.xml @@ -25,10 +25,6 @@ <name>Blur Hive</name> <description>The Blur hive module contains a storage handler and serde for Hive so that it can integrate with Hive.</description> - <properties> - <projectHiveVersion>${project.parent.version}.${hadoop.version}.${hive.version}</projectHiveVersion> - </properties> - <dependencies> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8fa45774/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b7d5b99..ebe6ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -192,12 +192,17 @@ under the License. <mrunit.version>0.9.0-incubating</mrunit.version> <httpclient.version>4.1.3</httpclient.version> <servlet-api.version>3.0.1</servlet-api.version> - <hive.version>0.13.1</hive.version> + <java-allocation-instrumenter.version>3.0</java-allocation-instrumenter.version> <commons-codec.version>1.9</commons-codec.version> <spark.version>1.5.0</spark.version> + <hive.version>0.13.1</hive.version> + <hive.version.display>${hive.version}</hive.version.display> <hadoop.version>2.6.0</hadoop.version> - <projectVersion>${project.parent.version}.${hadoop.version}</projectVersion> + <hadoop.version.display>${hadoop.version}</hadoop.version.display> + <projectVersionSuffix></projectVersionSuffix> + <projectVersion>${project.parent.version}.${hadoop.version.display}${projectVersionSuffix}</projectVersion> + <projectHiveVersion>${project.parent.version}.${hadoop.version.display.${hive.version.display}${projectVersionSuffix}</projectHiveVersion> </properties> <dependencyManagement>
