HIVE-10605 - Make hive version number update automatically in webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by Thejas Nair)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/eefb0718 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/eefb0718 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/eefb0718 Branch: refs/heads/llap Commit: eefb0718ea347680850620c5dd9eff5ec202566d Parents: 02b6cd1 Author: Eugene Koifman <ekoif...@hortonworks.com> Authored: Tue May 5 18:00:15 2015 -0700 Committer: Eugene Koifman <ekoif...@hortonworks.com> Committed: Tue May 5 18:00:15 2015 -0700 ---------------------------------------------------------------------- .../deployers/config/webhcat/webhcat-site.xml | 9 +-------- hcatalog/src/test/e2e/templeton/deployers/env.sh | 1 + hcatalog/webhcat/svr/pom.xml | 13 +++++++------ .../webhcat/svr/src/main/config/webhcat-default.xml | 10 +++++----- packaging/src/main/assembly/bin.xml | 1 + 5 files changed, 15 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml ---------------------------------------------------------------------- diff --git a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml index 7a2d450..8bcb1f0 100644 --- a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml +++ b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml @@ -24,8 +24,7 @@ <!-- install. --> <configuration> -<!--TODO: -1. make pig/hive versions env variables--> +<!--TODO:--> <property> <name>templeton.hcat</name> @@ -34,12 +33,6 @@ </property> <property> - <name>templeton.libjars</name> - <value>${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar</value> - <description>Jars to add to the classpath.</description> - </property> - - <property> <name>templeton.pig.archive</name> <value>hdfs:///apps/templeton/pig-${env.PIG_VERSION}.tar.gz</value> <description>The path to the Pig archive.</description> http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/env.sh ---------------------------------------------------------------------- diff --git a/hcatalog/src/test/e2e/templeton/deployers/env.sh b/hcatalog/src/test/e2e/templeton/deployers/env.sh index a9cc2d7..8b719f2 100755 --- a/hcatalog/src/test/e2e/templeton/deployers/env.sh +++ b/hcatalog/src/test/e2e/templeton/deployers/env.sh @@ -22,6 +22,7 @@ # define necessary env vars here and source it in other files +#todo: most of these variables are defined in pom.xml - see this can be integrated echo ${HADOOP_VERSION}; if [ -z ${HADOOP_VERSION} ]; then http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 54b8c98..5b6696e 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -151,12 +151,13 @@ </profiles> <build> - <resources> - <resource> - <targetPath>.</targetPath> - <directory>src/main/config</directory> - </resource> - </resources> + <resources> + <resource> + <targetPath>.</targetPath> + <directory>src/main/config</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml index dc6521a..801f3a5 100644 --- a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml +++ b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml @@ -39,7 +39,7 @@ <property> <name>templeton.libjars</name> - <value>${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar</value> + <value>${env.TEMPLETON_HOME}/../lib/zookeeper-${zookeeper.version}.jar,${env.TEMPLETON_HOME}/../lib/hive-common-${project.version}.jar</value> <description>Jars to add to the classpath.</description> </property> @@ -87,7 +87,7 @@ <property> <name>templeton.pig.path</name> - <value>pig-0.11.1.tar.gz/pig-0.11.1/bin/pig</value> + <value>pig-${pig.version}.tar.gz/pig-${pig.version}/bin/pig</value> <description>The path to the Pig executable.</description> </property> @@ -105,7 +105,7 @@ <property> <name>templeton.hive.path</name> - <value>hive-0.11.0.tar.gz/hive-0.11.0/bin/hive</value> + <value>hive-${project.version}.tar.gz/hive-${project.version}/bin/hive</value> <description>The path to the Hive executable. Applies only if templeton.hive.archive is defined.</description> </property> @@ -125,7 +125,7 @@ <property> <name>templeton.hive.home</name> - <value>hive-0.14.0-SNAPSHOT-bin.tar.gz/hive-0.14.0-SNAPSHOT-bin</value> + <value>hive-${project.version}-bin.tar.gz/hive-${project.version}-bin</value> <description> The path to the Hive home within the tar. This is needed if Hive is not installed on all nodes in the cluster and needs to be shipped to the target node in the cluster to execute Pig @@ -134,7 +134,7 @@ </property> <property> <name>templeton.hcat.home</name> - <value>hive-0.14.0-SNAPSHOT-bin.tar.gz/hive-0.14.0-SNAPSHOT-bin/hcatalog</value> + <value>hive-${project.version}-bin.tar.gz/hive-${project.version}-bin/hcatalog</value> <description> The path to the HCat home within the tar. This is needed if Hive is not installed on all nodes in the cluster and needs to be shipped to the target node in the cluster to execute Pig http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/packaging/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml index 2cda623..a1c176f 100644 --- a/packaging/src/main/assembly/bin.xml +++ b/packaging/src/main/assembly/bin.xml @@ -276,6 +276,7 @@ <include>webhcat-default.xml</include> <include>webhcat-log4j.properties</include> </includes> + <filtered>true</filtered> <outputDirectory>hcatalog/etc/webhcat</outputDirectory> </fileSet>