Return-Path: 
 <commits-return-14159-apmail-hive-commits-archive=hive.apache.org@hive.apache.org>
X-Original-To: apmail-hive-commits-archive@www.apache.org
Delivered-To: apmail-hive-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6C9EA18D3C
	for <apmail-hive-commits-archive@www.apache.org>;
 Fri, 15 May 2015 04:31:30 +0000 (UTC)
Received: (qmail 7021 invoked by uid 500); 15 May 2015 04:31:29 -0000
Delivered-To: apmail-hive-commits-archive@hive.apache.org
Received: (qmail 6872 invoked by uid 500); 15 May 2015 04:31:29 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 6076 invoked by uid 99); 15 May 2015 04:31:28 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2015 04:31:28 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 80EE5E3CC1; Fri, 15 May 2015 04:31:28 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: xuefu@apache.org
To: commits@hive.apache.org
Date: Fri, 15 May 2015 04:31:37 -0000
Message-Id: <d793af9cb39747f9965b7706017f29b0@git.apache.org>
In-Reply-To: <ad7ffe070d754aeaa4fe7fb6d40e8a88@git.apache.org>
References: <ad7ffe070d754aeaa4fe7fb6d40e8a88@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [10/50] [abbrv] hive git commit: HIVE-10605 - Make hive version
 number update automatically in webhcat-default.xml during hive tar generation
 (Eugene Koifman, reviewed by Thejas Nair)

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/beeline-cli
Commit: eefb0718ea347680850620c5dd9eff5ec202566d
Parents: 02b6cd1
Author: Eugene Koifman <ekoifman@hortonworks.com>
Authored: Tue May 5 18:00:15 2015 -0700
Committer: Eugene Koifman <ekoifman@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>