You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/04/12 19:08:15 UTC
svn commit: r1467358 - in /hive/trunk: build.properties build.xml

Author: hashutosh
Date: Fri Apr 12 17:08:14 2013
New Revision: 1467358

URL: http://svn.apache.org/r1467358
Log:
HIVE-4339 : build fails after branch (hcatalog version not updated) (Gunther Hagleitner via Ashutosh Chauhan)

Modified:
    hive/trunk/build.properties
    hive/trunk/build.xml

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1467358&r1=1467357&r2=1467358&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Fri Apr 12 17:08:14 2013
@@ -17,6 +17,7 @@
 Name=Hive
 name=hive
 version=0.12.0-SNAPSHOT
+hcatalog.version=0.11.0-SNAPSHOT
 year=2012
 
 javac.debug=on

Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1467358&r1=1467357&r2=1467358&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Fri Apr 12 17:08:14 2013
@@ -515,7 +515,7 @@
         inheritAll="false"/>
     <mkdir dir="${build.dir.hive}/hcatalog"/>
     <copy todir="${build.dir.hive}/hcatalog">
-        <fileset dir="${hive.root}/hcatalog/build/hcatalog-${version}"/>
+        <fileset dir="${hive.root}/hcatalog/build/hcatalog-${hcatalog.version}"/>
     </copy>
 
     <!-- special case because builtins compilation depends on packaging
@@ -1081,7 +1081,7 @@
           todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"
           todir="${mvn.jar.dir}" />
-    <copy file="${build.dir.hive}/hcatalog/hive-hcatalog-${version}.jar"
+    <copy file="${build.dir.hive}/hcatalog/hive-hcatalog-${hcatalog.version}.jar"
           todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/pdk/hive-pdk-${version}.jar"
           todir="${mvn.jar.dir}" />
@@ -1116,7 +1116,7 @@
     <copy file="${build.dir.hive}/metastore/pom.xml"
           tofile="${mvn.pom.dir}/hive-metastore-${version}.pom" />
     <copy file="${build.dir.hive}/hcatalog/pom.xml"
-          tofile="${mvn.pom.dir}/hive-hcatalog-${version}.pom" />
+          tofile="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom" />
     <copy file="${build.dir.hive}/pdk/pom.xml"
           tofile="${mvn.pom.dir}/hive-pdk-${version}.pom" />
     <copy file="${build.dir.hive}/ql/pom.xml"
@@ -1375,12 +1375,12 @@
 
     <!-- hive-hcatalog -->
     <sign-artifact
-        input.file="${mvn.pom.dir}/hive-hcatalog-${version}.jar"
-        output.file="${mvn.pom.dir}/hive-hcatalog-${version}.jar.asc"
+        input.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.jar"
+        output.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.jar.asc"
         gpg.passphrase="${gpg.passphrase}"/>
     <sign-artifact
-        input.file="${mvn.pom.dir}/hive-hcatalog-${version}.pom"
-        output.file="${mvn.pom.dir}/hive-hcatalog-${version}.pom.asc"
+        input.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom"
+        output.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
 
     <!-- hive-pdk -->