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/17 16:25:38 UTC
svn commit: r1468929 - in /hive/branches/branch-0.11: ./ beeline/ cli/
hcatalog/ hcatalog/build-support/ant/ hcatalog/core/
hcatalog/hcatalog-pig-adapter/ hcatalog/server-extensions/
hcatalog/storage-handlers/hbase/ hcatalog/webhcat/java-client/ hcatal...
Author: hashutosh
Date: Wed Apr 17 14:25:38 2013
New Revision: 1468929
URL: http://svn.apache.org/r1468929
Log:
HIVE-4278 : HCat needs to get current Hive jars instead of pulling them from maven repo (Sushanth Sowmyan via Ashutosh Chauhan)
Modified:
hive/branches/branch-0.11/beeline/ivy.xml
hive/branches/branch-0.11/build-common.xml
hive/branches/branch-0.11/build.properties
hive/branches/branch-0.11/cli/ivy.xml
hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml
hive/branches/branch-0.11/hcatalog/build.properties
hive/branches/branch-0.11/hcatalog/core/pom.xml
hive/branches/branch-0.11/hcatalog/hcatalog-pig-adapter/pom.xml
hive/branches/branch-0.11/hcatalog/pom.xml
hive/branches/branch-0.11/hcatalog/server-extensions/pom.xml
hive/branches/branch-0.11/hcatalog/storage-handlers/hbase/pom.xml
hive/branches/branch-0.11/hcatalog/webhcat/java-client/pom.xml
hive/branches/branch-0.11/hcatalog/webhcat/svr/pom.xml
hive/branches/branch-0.11/hwi/ivy.xml
hive/branches/branch-0.11/ql/build.xml
hive/branches/branch-0.11/ql/ivy.xml
Modified: hive/branches/branch-0.11/beeline/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/beeline/ivy.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/beeline/ivy.xml (original)
+++ hive/branches/branch-0.11/beeline/ivy.xml Wed Apr 17 14:25:38 2013
@@ -45,8 +45,6 @@
conf="compile->default" />
<dependency org="org.apache.hive" name="hive-shims" rev="${version}"
conf="runtime" transitive="false"/>
- <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
- conf="runtime" transitive="false"/>
<!-- Test Dependencies -->
<dependency org="junit" name="junit"
Modified: hive/branches/branch-0.11/build-common.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/build-common.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/build-common.xml (original)
+++ hive/branches/branch-0.11/build-common.xml Wed Apr 17 14:25:38 2013
@@ -264,7 +264,7 @@
</copy>
</target>
- <target name="jar" depends="compile">
+ <target name="jar" depends="make-pom,compile">
<echo message="Project: ${ant.project.name}" />
<jar
jarfile="${build.dir}/hive-${ant.project.name}-${version}.jar"
@@ -528,7 +528,7 @@
<available file="${basedir}/ivy.xml" property="ivy.present"/>
</target>
- <target name="make-pom" if="ivy.present" depends="check-ivy, jar">
+ <target name="make-pom" if="ivy.present" depends="check-ivy,ivy-resolve">
<echo message="Project: ${ant.project.name}"/>
<echo> Writing POM to ${build.dir}/pom.xml</echo>
Modified: hive/branches/branch-0.11/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/build.properties?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/build.properties (original)
+++ hive/branches/branch-0.11/build.properties Wed Apr 17 14:25:38 2013
@@ -72,10 +72,10 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
# module names needed for build process
-iterate.hive.all=ant,shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
-iterate.hive.modules=shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
-iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,hcatalog,odbc,serde,service
-iterate.hive.thrift=ql,service,metastore,hcatalog,serde
+iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils,hcatalog
+iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils,hcatalog
+iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service,hcatalog
+iterate.hive.thrift=ql,service,metastore,serde
iterate.hive.protobuf=ql
iterate.hive.cpp=odbc
Modified: hive/branches/branch-0.11/cli/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/cli/ivy.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/cli/ivy.xml (original)
+++ hive/branches/branch-0.11/cli/ivy.xml Wed Apr 17 14:25:38 2013
@@ -35,7 +35,5 @@
conf="compile->default" />
<dependency org="org.apache.hive" name="hive-shims" rev="${version}"
conf="runtime" transitive="false"/>
- <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
- conf="runtime" transitive="false"/>
</dependencies>
</ivy-module>
Modified: hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml (original)
+++ hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml Wed Apr 17 14:25:38 2013
@@ -21,6 +21,8 @@
<project xmlns:artifact="artifact:org.apache.maven.artifact.ant">
+ <loadproperties srcfile="${path.to.basedir}/build.properties"/>
+
<macrodef name="_sign">
<attribute name="inputFile"/>
<sequential>
@@ -38,6 +40,36 @@
</sequential>
</macrodef>
+ <macrodef name="_mvnpublish">
+ <attribute name="module"/>
+ <attribute name="jarname" default="@{module}"/>
+ <sequential>
+ <echo message="Installing local artifact for maven : @{module}" />
+ <artifact:install file="${path.to.basedir}/../build/@{module}/hive-@{jarname}-${hive.version}.jar">
+ <artifact:pom file="${path.to.basedir}/../build/@{module}/pom.xml"/>
+ <artifact:localRepository path="${mvn.local.repo}"/>
+ </artifact:install>
+ </sequential>
+ </macrodef>
+
+ <target name="hive-mvn-publish">
+ <!-- Pick built jars for all the hive artifacts and install them to local maven cache -->
+ <_mvnpublish module="shims" />
+ <_mvnpublish module="common" />
+ <_mvnpublish module="serde" />
+ <_mvnpublish module="metastore" />
+ <_mvnpublish module="ql" jarname="exec"/>
+ <_mvnpublish module="contrib" />
+ <_mvnpublish module="service" />
+ <_mvnpublish module="cli" />
+ <_mvnpublish module="jdbc" />
+ <_mvnpublish module="beeline" />
+ <_mvnpublish module="hwi" />
+ <_mvnpublish module="hbase-handler" />
+ <_mvnpublish module="pdk" />
+ <_mvnpublish module="testutils" />
+ </target>
+
<target name="mvn-init" unless="mvn-init.complete">
<echo message="${ant.project.name}"/>
<get src="${mvnrepo}/org/apache/maven/maven-ant-tasks/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
@@ -47,6 +79,7 @@
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="artifact:org.apache.maven.artifact.ant"
classpath="${path.to.basedir}/build/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
+ <antcall target="hive-mvn-publish" />
<artifact:dependencies>
<dependency groupId="org.apache.hcatalog" artifactId="hcatalog" version="${hcatalog.version}" scope="system" systemPath="${path.to.basedir}/pom.xml"/>
</artifact:dependencies>
Modified: hive/branches/branch-0.11/hcatalog/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/build.properties?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/build.properties (original)
+++ hive/branches/branch-0.11/hcatalog/build.properties Wed Apr 17 14:25:38 2013
@@ -15,7 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-hcatalog.version=0.11.0-SNAPSHOT
+hive.version=0.11.0-SNAPSHOT
+hcatalog.version=${hive.version}
jar.name=${ant.project.name}-${hcatalog.version}.jar
hcatalog.jar=${ant.project.name}-${hcatalog.version}.jar
hcatalog.core.jar=${ant.project.name}-core-${hcatalog.version}.jar
Modified: hive/branches/branch-0.11/hcatalog/core/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/core/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/core/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/core/pom.xml Wed Apr 17 14:25:38 2013
@@ -32,7 +32,6 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-core</artifactId>
<packaging>jar</packaging>
- <version>0.11.0-SNAPSHOT</version>
<name>hcatalog-core</name>
<url>http://maven.apache.org</url>
@@ -61,12 +60,6 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-builtins</artifactId>
- <version>${hive.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
<artifactId>hive-cli</artifactId>
<version>${hive.version}</version>
<scope>compile</scope>
Modified: hive/branches/branch-0.11/hcatalog/hcatalog-pig-adapter/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/hcatalog-pig-adapter/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/hcatalog-pig-adapter/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/hcatalog-pig-adapter/pom.xml Wed Apr 17 14:25:38 2013
@@ -32,7 +32,6 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-pig-adapter</artifactId>
<packaging>jar</packaging>
- <version>0.11.0-SNAPSHOT</version>
<name>hcatalog-pig-adapter</name>
<url>http://maven.apache.org</url>
Modified: hive/branches/branch-0.11/hcatalog/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/pom.xml Wed Apr 17 14:25:38 2013
@@ -30,7 +30,7 @@
<hadoop23.version>2.0.3-alpha</hadoop23.version>
<hbase.version>0.94.5</hbase.version>
<hcatalog.version>${project.version}</hcatalog.version>
- <hive.version>0.11.0-SNAPSHOT</hive.version>
+ <hive.version>${project.version}</hive.version>
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.14</jersey.version>
<jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
@@ -42,12 +42,6 @@
<metrics-core.version>2.1.2</metrics-core.version>
</properties>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>11</version>
- </parent>
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
Modified: hive/branches/branch-0.11/hcatalog/server-extensions/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/server-extensions/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/server-extensions/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/server-extensions/pom.xml Wed Apr 17 14:25:38 2013
@@ -32,7 +32,6 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-server-extensions</artifactId>
<packaging>jar</packaging>
- <version>0.11.0-SNAPSHOT</version>
<name>server-extensions</name>
<url>http://maven.apache.org</url>
Modified: hive/branches/branch-0.11/hcatalog/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/storage-handlers/hbase/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/storage-handlers/hbase/pom.xml Wed Apr 17 14:25:38 2013
@@ -32,7 +32,6 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hbase-storage-handler</artifactId>
<packaging>jar</packaging>
- <version>0.11.0-SNAPSHOT</version>
<name>hbase-storage-handler</name>
<url>http://maven.apache.org</url>
Modified: hive/branches/branch-0.11/hcatalog/webhcat/java-client/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/webhcat/java-client/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/webhcat/java-client/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/webhcat/java-client/pom.xml Wed Apr 17 14:25:38 2013
@@ -32,7 +32,6 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>webhcat-java-client</artifactId>
<packaging>jar</packaging>
- <version>0.11.0-SNAPSHOT</version>
<name>webhcat-java-client</name>
<url>http://maven.apache.org</url>
Modified: hive/branches/branch-0.11/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/webhcat/svr/pom.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/branches/branch-0.11/hcatalog/webhcat/svr/pom.xml Wed Apr 17 14:25:38 2013
@@ -32,7 +32,6 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>webhcat</artifactId>
<packaging>jar</packaging>
- <version>0.11.0-SNAPSHOT</version>
<name>webhcat</name>
<url>http://maven.apache.org</url>
Modified: hive/branches/branch-0.11/hwi/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hwi/ivy.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/hwi/ivy.xml (original)
+++ hive/branches/branch-0.11/hwi/ivy.xml Wed Apr 17 14:25:38 2013
@@ -31,8 +31,6 @@
<dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" />
<!-- Test Dependencies -->
- <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
- conf="test->default" transitive="false"/>
<dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}"
conf="test->default"
transitive="false"/>
Modified: hive/branches/branch-0.11/ql/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/build.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/build.xml (original)
+++ hive/branches/branch-0.11/ql/build.xml Wed Apr 17 14:25:38 2013
@@ -201,7 +201,7 @@
<!-- Override jar target to specify main class and compiler stuff -->
- <target name="jar" depends="compile">
+ <target name="jar" depends="make-pom,compile">
<echo message="Project: ${ant.project.name}"/>
<unzip src="${build.ivy.lib.dir}/default/libthrift-${libthrift.version}.jar" dest="${build.dir.hive}/thrift/classes">
<patternset>
Modified: hive/branches/branch-0.11/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/ivy.xml?rev=1468929&r1=1468928&r2=1468929&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/ivy.xml (original)
+++ hive/branches/branch-0.11/ql/ivy.xml Wed Apr 17 14:25:38 2013
@@ -28,8 +28,6 @@
<dependencies>
<dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
conf="compile->default" />
- <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
- conf="test->default,runtime" transitive="false"/>
<dependency org="org.apache.hive" name="hive-hbase-handler" rev="${version}"
conf="test->default" transitive="false"/>
<dependency org="org.apache.hive" name="hive-contrib" rev="${version}"