You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by am...@apache.org on 2011/05/18 12:22:58 UTC
svn commit: r1124171 - in /hive/branches/branch-0.7: ./ ant/ cli/ common/
contrib/ hbase-handler/ hwi/ ivy/ jdbc/ metastore/ ql/ serde/ service/ shims/
Author: amareshwari
Date: Wed May 18 10:22:57 2011
New Revision: 1124171
URL: http://svn.apache.org/viewvc?rev=1124171&view=rev
Log:
HIVE-1095 Merge -r 1124163:1124164 from trunk
Added:
hive/branches/branch-0.7/jdbc/ivy.xml
hive/branches/branch-0.7/service/ivy.xml
Modified:
hive/branches/branch-0.7/ant/ivy.xml
hive/branches/branch-0.7/build-common.xml
hive/branches/branch-0.7/build.xml
hive/branches/branch-0.7/cli/ivy.xml
hive/branches/branch-0.7/common/ivy.xml
hive/branches/branch-0.7/contrib/ivy.xml
hive/branches/branch-0.7/hbase-handler/ivy.xml
hive/branches/branch-0.7/hwi/ivy.xml
hive/branches/branch-0.7/ivy.xml
hive/branches/branch-0.7/ivy/libraries.properties
hive/branches/branch-0.7/metastore/ivy.xml
hive/branches/branch-0.7/ql/ivy.xml
hive/branches/branch-0.7/serde/ivy.xml
hive/branches/branch-0.7/shims/ivy.xml
Modified: hive/branches/branch-0.7/ant/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/ant/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/ant/ivy.xml (original)
+++ hive/branches/branch-0.7/ant/ivy.xml Wed May 18 10:22:57 2011
@@ -15,5 +15,12 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="ant"/>
+ <info organisation="${hive.ivy.org}" module="hive-anttasks" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
+
</ivy-module>
Modified: hive/branches/branch-0.7/build-common.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/build-common.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/build-common.xml (original)
+++ hive/branches/branch-0.7/build-common.xml Wed May 18 10:22:57 2011
@@ -18,7 +18,9 @@
-->
-<project xmlns:ivy="antlib:org.apache.ivy.ant" name="hivecommon" default="jar">
+<project xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:artifact="urn:maven-artifact-ant"
+ name="hivecommon" default="jar">
<property name="hive.root" location="${basedir}/.."/>
<property file="${hive.root}/build.properties"/>
@@ -84,13 +86,15 @@
<loadproperties srcfile="${ivy.conf.dir}/libraries.properties"/>
<property name="ivy.jar" location="${build.ivy.lib.dir}/ivy-${ivy.version}.jar"/>
<property name="ivysettings.xml" location="${ivy.conf.dir}/ivysettings.xml" />
- <property name="ivy.org" value="org.apache.hadoop"/>
<property name="mvn.repo" value="http://repo2.maven.org/maven2"/>
- <property name="repo" value="snapshots"/>
- <property name="asfrepo" value="https://repository.apache.org/content/repositories/${repo}"/>
- <property name="ant_task_repo_url" value="${mvn.repo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
<property name="ivy_repo_url" value="${mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
+ <!-- Maven properties set here -->
+ <property name="hive.ivy.org" value="org.apache.hive"/>
+ <property name="mvn.publish.repo" value="snapshots"/>
+ <property name="mvn.publish.repo.id" value="apache.${mvn.publish.repo}.https" />
+ <property name="mvn.publish.repo.url" value="https://repository.apache.org/content/repositories/${mvn.publish.repo}"/>
+
<condition property="offline">
<istrue value="${is-offline}"/>
</condition>
@@ -183,6 +187,19 @@
<ivy:cachepath pathid="checkstyle-classpath" conf="checkstyle"/>
</target>
+ <target name="ivy-resolve-maven-ant-tasks" depends="ivy-init">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="maven"
+ log="${ivyresolvelog}"/>
+ </target>
+
+ <target name="ivy-retrieve-maven-ant-tasks" depends="ivy-resolve-maven-ant-tasks"
+ description="Retrieve Ivy-managed artifacts for the maven-ant-tasks configurations">
+ <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
+ log="${ivyresolvelog}"/>
+ <ivy:cachepath pathid="maven-ant-tasks.classpath" conf="maven"/>
+ </target>
+
<target name="ivy-retrieve-hadoop-source" depends="ivy-init"
description="Retrieve Ivy-managed Hadoop source artifacts" unless="ivy.skip">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
@@ -490,4 +507,54 @@
</condition>
</target>
+ <target name="check-ivy" depends="ivy-init">
+ <available file="${basedir}/ivy.xml" property="ivy.present"/>
+ </target>
+
+ <target name="make-pom" if="ivy.present" depends="check-ivy, jar">
+ <echo> Writing POM to ${build.dir}/pom.xml</echo>
+
+ <ivy:makepom ivyfile="${basedir}/ivy.xml" pomfile="${build.dir}/pom.xml">
+ <mapping conf="default" scope="compile" />
+ <mapping conf="runtime" scope="runtime" />
+ </ivy:makepom>
+ <replace file="${build.dir}/pom.xml">
+ <replacetoken><dependencies></replacetoken>
+ <replacevalue>
+ <description>Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive </description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://svn.apache.org/repos/asf/hive/</url>
+ </scm>
+ <dependencies>
+ </replacevalue>
+ </replace>
+ </target>
+
+ <target name="mvn-taskdef" depends="ivy-retrieve-maven-ant-tasks">
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+ </target>
+
+ <!-- Deploy a single artifact to the maven repository -->
+ <target name="maven-publish-artifact" depends="mvn-taskdef">
+ <artifact:pom
+ file="${build.dir.hive}/maven/poms/hive-${hive.project}-${version}.pom"
+ id="hive.project.pom" />
+
+ <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2" />
+ <artifact:deploy
+ file="${build.dir.hive}/maven/jars/hive-${hive.project}-${version}.jar">
+ <remoteRepository id="${mvn.publish.repo.id}" url="${mvn.publish.repo.url}" />
+ <pom refid="hive.project.pom" />
+ </artifact:deploy>
+ </target>
+
</project>
Modified: hive/branches/branch-0.7/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/build.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/build.xml (original)
+++ hive/branches/branch-0.7/build.xml Wed May 18 10:22:57 2011
@@ -18,7 +18,7 @@
-->
-<project name="hive" default="jar" >
+<project name="hive" default="jar" xmlns:artifact="urn:maven-artifact-ant" >
<property name="hive.root" location="${basedir}"/>
<property file="${hive.root}/build.properties"/>
@@ -53,6 +53,7 @@
<property name="checkstyle.build.dir" location="${build.dir.hive}/checkstyle"/>
<property name="md5sum.format" value="{0} {1}"/>
+
<condition property="is-offline" value="true" else="false">
<isset property="offline"/>
</condition>
@@ -649,5 +650,142 @@
<copy file="${docs.src}/site.css" tofile="${anakia.docs.dest}/site.css" />
</target>
+ <!-- Prepare for maven deploy i.e. jars, poms, and licence -->
+
+ <target name="maven-build" depends="jar" description="Build Maven artifacts">
+ <!-- create jars, poms licences directory -->
+ <mkdir dir="${build.dir.hive}/maven/jars" />
+ <mkdir dir="${build.dir.hive}/maven/poms" />
+ <mkdir dir="${build.dir.hive}/maven/licences" />
+
+ <!-- call make pom on all projects that have ivy.xml -->
+ <iterate-all target="make-pom" />
+
+ <!-- copy the jars -->
+ <copy file="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/cli/hive-cli-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/common/hive-common-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/hbase-handler/hive-hbase-handler-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/hwi/hive-hwi-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/jdbc/hive-jdbc-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/ql/hive-exec-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/serde/hive-serde-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/service/hive-service-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+ <copy file="${build.dir.hive}/shims/hive-shims-${version}.jar"
+ todir="${build.dir.hive}/maven/jars/" />
+
+ <!-- copy over maven pom files created using the make-pom target and rename to maven convention -->
+ <copy file="${build.dir.hive}/anttasks/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-anttasks-${version}.pom" />
+ <copy file="${build.dir.hive}/cli/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-cli-${version}.pom" />
+ <copy file="${build.dir.hive}/common/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-common-${version}.pom" />
+ <copy file="${build.dir.hive}/contrib/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-contrib-${version}.pom" />
+ <copy file="${build.dir.hive}/hbase-handler/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-hbase-handler-${version}.pom" />
+ <copy file="${build.dir.hive}/hwi/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-hwi-${version}.pom" />
+ <copy file="${build.dir.hive}/jdbc/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-jdbc-${version}.pom" />
+ <copy file="${build.dir.hive}/metastore/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-metastore-${version}.pom" />
+ <copy file="${build.dir.hive}/ql/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-exec-${version}.pom" />
+ <copy file="${build.dir.hive}/serde/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-serde-${version}.pom" />
+ <copy file="${build.dir.hive}/service/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-service-${version}.pom" />
+ <copy file="${build.dir.hive}/shims/pom.xml"
+ tofile="${build.dir.hive}/maven/poms/hive-shims-${version}.pom" />
+
+ <!-- copy over licence -->
+ <copy file="${hive.root}/LICENSE" todir="${build.dir.hive}/maven/licences/" />
+
+ <!-- checksum files -->
+ <checksum forceOverwrite="yes" algorithm="MD5" fileext=".md5">
+ <fileset dir="${build.dir.hive}/maven/jars" excludes="**/*.sha1,**/*.md5" />
+ <fileset dir="${build.dir.hive}/maven/poms" excludes="**/*.sha1,**/*.md5" />
+ <fileset dir="${build.dir.hive}/maven/licences" excludes="**/*.sha1,**/*.md5" />
+ </checksum>
+
+ <checksum forceOverwrite="yes" algorithm="SHA" fileext=".sha1">
+ <fileset dir="${build.dir.hive}/maven/jars" excludes="**/*.sha1,**/*.md5" />
+ <fileset dir="${build.dir.hive}/maven/poms" excludes="**/*.sha1,**/*.md5" />
+ <fileset dir="${build.dir.hive}/maven/licences" excludes="**/*.sha1,**/*.md5" />
+ </checksum>
+
+ <echo>
+ To deploy using maven:
+ 1) Copy the following to the ~/.m2/settings.xml file please
+ see:http://maven.apache.org/developers/committer-settings.html
+ <servers>
+ <server>
+ <id>apache.${repo}.https</id>
+ <username>[username]</username>
+ <password>[password]</password>
+ </server>
+ </servers>
+ 2)Read
+ http://www.apache.org/dev/repository-faq.html
+ http://www.apache.org/dev/publishing-maven-artifacts.html
+ 3)Run the maven-publish target to publish
+ the artifact to the ASF Nexus
+ staging process
+ </echo>
+ </target>
+
+ <target name="maven-publish" description="Publish Maven artifacts">
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="anttasks" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="cli" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="common" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="contrib" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="exec" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="hbase-handler" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="hwi" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="jdbc" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="metastore" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="serde" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="service" />
+ </antcall>
+ <antcall target="maven-publish-artifact">
+ <param name="hive.project" value="shims" />
+ </antcall>
+ </target>
</project>
Modified: hive/branches/branch-0.7/cli/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/cli/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/cli/ivy.xml (original)
+++ hive/branches/branch-0.7/cli/ivy.xml Wed May 18 10:22:57 2011
@@ -16,7 +16,13 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="cli"/>
+ <info organisation="${hive.ivy.org}" module="hive-cli" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/common/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/common/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/common/ivy.xml (original)
+++ hive/branches/branch-0.7/common/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,13 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="common"/>
+ <info organisation="${hive.ivy.org}" module="hive-common" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/contrib/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/contrib/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/contrib/ivy.xml (original)
+++ hive/branches/branch-0.7/contrib/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="contrib"/>
+ <info organisation="${hive.ivy.org}" module="hive-contrib" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
+
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/hbase-handler/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/hbase-handler/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/hbase-handler/ivy.xml (original)
+++ hive/branches/branch-0.7/hbase-handler/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="contrib"/>
+ <info organisation="${hive.ivy.org}" module="hive-hbase-handler" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
+
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/hwi/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/hwi/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/hwi/ivy.xml (original)
+++ hive/branches/branch-0.7/hwi/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,14 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="hwi"/>
+ <info organisation="${hive.ivy.org}" module="hive-hwi" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
+
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/ivy.xml (original)
+++ hive/branches/branch-0.7/ivy.xml Wed May 18 10:22:57 2011
@@ -16,9 +16,9 @@
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="${ant.project.name}" revision="${version}">
+ <info organisation="org.apache.hive" module="${ant.project.name}" revision="${version}">
<license name="Apache 2.0"/>
- <ivyauthor name="Apache Hive Team" url="http://hadoop.apache.org/hive"/>
+ <ivyauthor name="Apache Hive Team" url="http://hive.apache.org"/>
<description>Apache Hive</description>
</info>
@@ -31,6 +31,7 @@
<!-- Private configurations -->
<conf name="docs" visibility="private"/>
<conf name="checkstyle" visibility="private"/>
+ <conf name="maven" visibility="private"/>
</configurations>
@@ -39,6 +40,8 @@
conf="checkstyle->default"/>
<dependency org="org.jdom" name="jdom" rev="${jdom.version}"
conf="docs->default"/>
+ <dependency org="org.apache.maven" name="maven-ant-tasks" rev="${maven-ant-tasks.version}"
+ conf="maven->default"/>
<conflict manager="all" />
</dependencies>
Modified: hive/branches/branch-0.7/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/ivy/libraries.properties?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/ivy/libraries.properties (original)
+++ hive/branches/branch-0.7/ivy/libraries.properties Wed May 18 10:22:57 2011
@@ -43,6 +43,7 @@ jline.version=0.9.94
junit.version=3.8.1
ivy.version=2.1.0
log4j.version=1.2.15
+maven-ant-tasks.version=2.1.0
slf4j-api.version=1.6.1
slf4j-log4j12.version=1.6.1
thrift.version=0.5.0
Added: hive/branches/branch-0.7/jdbc/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/jdbc/ivy.xml?rev=1124171&view=auto
==============================================================================
--- hive/branches/branch-0.7/jdbc/ivy.xml (added)
+++ hive/branches/branch-0.7/jdbc/ivy.xml Wed May 18 10:22:57 2011
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ivy-module version="2.0">
+ <info organisation="${hive.ivy.org}" module="hive-jdbc" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
+</ivy-module>
Modified: hive/branches/branch-0.7/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/metastore/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/metastore/ivy.xml (original)
+++ hive/branches/branch-0.7/metastore/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,13 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="metastore"/>
+ <info organisation="${hive.ivy.org}" module="hive-metastore" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/ql/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/ql/ivy.xml (original)
+++ hive/branches/branch-0.7/ql/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,13 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
- <info organisation="org.apache.hadoop.hive" module="ql"/>
+ <info organisation="${hive.ivy.org}" module="hive-exec" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Modified: hive/branches/branch-0.7/serde/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/serde/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/serde/ivy.xml (original)
+++ hive/branches/branch-0.7/serde/ivy.xml Wed May 18 10:22:57 2011
@@ -15,7 +15,13 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="serde"/>
+ <info organisation="${hive.ivy.org}" module="hive-serde" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
Added: hive/branches/branch-0.7/service/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/service/ivy.xml?rev=1124171&view=auto
==============================================================================
--- hive/branches/branch-0.7/service/ivy.xml (added)
+++ hive/branches/branch-0.7/service/ivy.xml Wed May 18 10:22:57 2011
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ivy-module version="2.0">
+ <info organisation="${hive.ivy.org}" module="hive-service" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
+</ivy-module>
Modified: hive/branches/branch-0.7/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.7/shims/ivy.xml?rev=1124171&r1=1124170&r2=1124171&view=diff
==============================================================================
--- hive/branches/branch-0.7/shims/ivy.xml (original)
+++ hive/branches/branch-0.7/shims/ivy.xml Wed May 18 10:22:57 2011
@@ -16,7 +16,13 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.hadoop.hive" module="shims"/>
+ <info organisation="${hive.ivy.org}" module="hive-shims" revision="${version}">
+ <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://hive.apache.org">
+ Hive is a data warehouse infrastructure built on top of Hadoop see
+ http://wiki.apache.org/hadoop/Hive
+ </description>
+ </info>
<dependencies>
<dependency org="hadoop" name="core" rev="${hadoop.version}">
<artifact name="hadoop" type="source" ext="tar.gz"/>