FAQ
Modified: hive/trunk/serde/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/serde/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
==============================================================================
--- hive/trunk/serde/ivy.xml (original)
+++ hive/trunk/serde/ivy.xml Tue Nov 8 19:28:19 2011
@@ -15,23 +15,38 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <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">
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
- </description>
- </info>
- <dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
- <artifact name="hadoop" type="source" ext="tar.gz"/>
- </dependency>
- <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"/>
- <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}"/>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
- <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
- transitive="false"/>
- </dependencies>
+ <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">
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+ </description>
+ </info>
+ <configurations>
+ <include file="${ivy.conf.dir}/common-configurations.xml"/>
+ </configurations>
+ <dependencies>
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
+ <artifact name="hadoop" type="source" ext="tar.gz"/>
+ </dependency>
+ <dependency org="org.apache.hive" name="hive-common" rev="${version}"
+ conf="runtime" transitive="false"/>
+ <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
+ conf="runtime" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
+ transitive="false"/>
+ <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}"/>
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
+ <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
+ transitive="false"/>
+ <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
+ <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
+ transitive="false"/>
+ <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
+ transitive="false"/>
+ <dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}"
+ transitive="false"/>
+ </dependencies>
</ivy-module>

Modified: hive/trunk/service/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/service/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
==============================================================================
--- hive/trunk/service/build.xml (original)
+++ hive/trunk/service/build.xml Tue Nov 8 19:28:19 2011
@@ -49,7 +49,7 @@
</exec>
</target>

- <target name="core-compile" depends="init">
+ <target name="compile" depends="init,ivy-retrieve">
<echo message="Project: ${ant.project.name}"/>
<javac
encoding="${build.encoding}"
@@ -58,15 +58,11 @@
destdir="${build.classes}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
- >
+ includeantruntime="false">
<classpath refid="classpath"/>
</javac>
</target>

- <target name="compile" depends="core-compile">
- <echo message="Project: ${ant.project.name}"/>
- </target>
-
<target name="clean">
<echo message="Project: ${ant.project.name}"/>
<delete dir="${build.classes}/../"/>

Modified: hive/trunk/service/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/service/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
==============================================================================
--- hive/trunk/service/ivy.xml (original)
+++ hive/trunk/service/ivy.xml Tue Nov 8 19:28:19 2011
@@ -16,17 +16,30 @@
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">
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
- </description>
- </info>
- <dependencies>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
- <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
- transitive="false"/>
- </dependencies>
+ <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">
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+ </description>
+ </info>
+ <configurations>
+ <include file="${ivy.conf.dir}/common-configurations.xml"/>
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.hive" name="hive-common" rev="${version}"
+ conf="runtime" transitive="false"/>
+ <dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
+ conf="runtime" transitive="false"/>
+ <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
+ conf="runtime" transitive="false"/>
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
+ <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
+ transitive="false"/>
+ <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
+ transitive="false"/>
+ <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
+ transitive="false"/>
+ </dependencies>
</ivy-module>

Modified: hive/trunk/shims/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
==============================================================================
--- hive/trunk/shims/build.xml (original)
+++ hive/trunk/shims/build.xml Tue Nov 8 19:28:19 2011
@@ -51,7 +51,8 @@ to call at top-level: ant deploy-contrib
excludes="**/Proxy*.java"
destdir="${build.classes}"
debug="${javac.debug}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="classpath"/>
<src path="${basedir}/src/${hadoop.version.ant-internal.prefix}/java" />
@@ -59,7 +60,7 @@ to call at top-level: ant deploy-contrib
</javac>
</target>

- <target name="compile" depends="init">
+ <target name="compile" depends="init,ivy-retrieve">
<echo message="Project: ${ant.project.name}"/>
<antcall target="build_shims" inheritRefs="false" inheritAll="false">
<param name="hadoop.version.ant-internal" value="${hadoop.version}" />
@@ -74,7 +75,8 @@ to call at top-level: ant deploy-contrib
includes="**/Proxy*.java"
destdir="${build.classes}"
debug="${javac.debug}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="classpath"/>
<src path="${basedir}/src/${hadoop.version.ant-internal.prefix}/java" />
@@ -96,7 +98,8 @@ to call at top-level: ant deploy-contrib
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="classpath"/>
</javac>
@@ -109,7 +112,8 @@ to call at top-level: ant deploy-contrib
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="classpath"/>
</javac>

Modified: hive/trunk/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
==============================================================================
--- hive/trunk/shims/ivy.xml (original)
+++ hive/trunk/shims/ivy.xml Tue Nov 8 19:28:19 2011
@@ -16,22 +16,29 @@
limitations under the License.
-->
<ivy-module version="2.0">
- <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">
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
- </description>
- </info>
- <dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
- <artifact name="hadoop" type="source" ext="tar.gz"/>
- </dependency>
- <dependency org="hadoop" name="core" rev="${hadoop.security.version}">
- <artifact name="hadoop" type="source" ext="tar.gz"/>
- </dependency>
- <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
- transitive="false"/>
- <conflict manager="all" />
- </dependencies>
+ <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">
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+ </description>
+ </info>
+ <configurations>
+ <include file="${ivy.conf.dir}/common-configurations.xml"/>
+ </configurations>
+ <dependencies>
+ <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <artifact name="hadoop" type="source" ext="tar.gz"/>
+ </dependency>
+ <dependency org="hadoop" name="core" rev="${hadoop.security.version}">
+ <artifact name="hadoop" type="source" ext="tar.gz"/>
+ </dependency>
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
+ <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
+ transitive="false"/>
+ <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
+ transitive="false"/>
+ <conflict manager="all" />
+ </dependencies>
</ivy-module>

Search Discussions

  • Jvs at Nov 8, 2011 at 7:28 pm
    Author: jvs
    Date: Tue Nov 8 19:28:19 2011
    New Revision: 1199399

    URL: http://svn.apache.org/viewvc?rev=1199399&view=rev
    Log:
    HIVE-2391. Published POMs in Maven repo are incorrect
    (Carl Steinbach via jvs)


    Added:
    hive/trunk/ivy/common-configurations.xml
    hive/trunk/odbc/ivy.xml
    Removed:
    hive/trunk/cli/lib/README
    hive/trunk/cli/lib/jline-0.9.94.LICENSE
    hive/trunk/cli/lib/jline-0.9.94.jar
    hive/trunk/lib/asm-3.1.LICENSE
    hive/trunk/lib/asm-3.1.jar
    hive/trunk/lib/commons-collections-3.2.1.LICENSE
    hive/trunk/lib/commons-collections-3.2.1.jar
    hive/trunk/lib/commons-lang-2.4.LICENSE
    hive/trunk/lib/commons-lang-2.4.jar
    hive/trunk/lib/commons-logging-1.0.4.jar
    hive/trunk/lib/commons-logging-api-1.0.4.jar
    hive/trunk/lib/derby.LICENSE
    hive/trunk/lib/derby.jar
    hive/trunk/lib/json-LICENSE.txt
    hive/trunk/lib/json-README.txt
    hive/trunk/lib/json.jar
    hive/trunk/lib/velocity-1.5.jar
    hive/trunk/lib/velocity.LICENSE
    hive/trunk/ql/lib/README
    hive/trunk/ql/lib/antlr-2.7.7.LICENSE
    hive/trunk/ql/lib/antlr-2.7.7.jar
    hive/trunk/ql/lib/antlr-3.0.1.LICENSE
    hive/trunk/ql/lib/antlr-3.0.1.jar
    hive/trunk/ql/lib/antlr-runtime-3.0.1.LICENSE
    hive/trunk/ql/lib/antlr-runtime-3.0.1.jar
    hive/trunk/ql/lib/stringtemplate-3.1b1.LICENSE
    hive/trunk/ql/lib/stringtemplate-3.1b1.jar
    Modified:
    hive/trunk/ant/build.xml
    hive/trunk/ant/ivy.xml
    hive/trunk/build-common.xml
    hive/trunk/build.properties
    hive/trunk/build.xml
    hive/trunk/cli/build.xml
    hive/trunk/cli/ivy.xml
    hive/trunk/common/build.xml
    hive/trunk/common/ivy.xml
    hive/trunk/contrib/build.xml
    hive/trunk/contrib/ivy.xml
    hive/trunk/contrib/src/test/queries/clientpositive/dboutput.q
    hive/trunk/eclipse-templates/.classpath
    hive/trunk/hbase-handler/build.xml
    hive/trunk/hbase-handler/ivy.xml
    hive/trunk/hwi/build.xml
    hive/trunk/hwi/ivy.xml
    hive/trunk/ivy.xml
    hive/trunk/ivy/ivysettings.xml
    hive/trunk/ivy/libraries.properties
    hive/trunk/jdbc/build.xml
    hive/trunk/jdbc/ivy.xml
    hive/trunk/lib/README
    hive/trunk/metastore/build.xml
    hive/trunk/metastore/ivy.xml
    hive/trunk/pdk/build.xml
    hive/trunk/pdk/ivy.xml
    hive/trunk/ql/build.xml
    hive/trunk/ql/ivy.xml
    hive/trunk/ql/src/test/queries/clientpositive/set_processor_namespaces.q
    hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
    hive/trunk/serde/build.xml
    hive/trunk/serde/ivy.xml
    hive/trunk/service/build.xml
    hive/trunk/service/ivy.xml
    hive/trunk/shims/build.xml
    hive/trunk/shims/ivy.xml

    Modified: hive/trunk/ant/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ant/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ant/build.xml (original)
    +++ hive/trunk/ant/build.xml Tue Nov 8 19:28:19 2011
    @@ -27,12 +27,8 @@ to call at top-level: ant deploy-contrib
    <property name="src.dir" location="${basedir}/src"/>
    <import file="../build-common.xml"/>

    - <target name="init" depends="create-dirs">
    - <echo message="Project: ${ant.project.name}"/>
    - </target>
    -
    - <target name="compile" depends="init">
    - <echo message="Project: ${ant.project.name}"/>
    + <target name="compile" depends="init,ivy-retrieve">
    + <echo message="${ant.project.name}"/>
    <javac
    encoding="${build.encoding}"
    srcdir="${src.dir}"
    @@ -46,7 +42,7 @@ to call at top-level: ant deploy-contrib
    </target>

    <target name="jar" depends="compile">
    - <echo message="Project: ${ant.project.name}"/>
    + <echo message="${ant.project.name}"/>
    <copy file="${src.dir}/org/apache/hadoop/hive/ant/antlib.xml"
    todir="${build.dir}/classes/org/apache/hadoop/hive/ant"/>
    <jar destfile="${build.dir}/hive-anttasks-${version}.jar">

    Modified: hive/trunk/ant/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ant/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ant/ivy.xml (original)
    +++ hive/trunk/ant/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -15,12 +15,18 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    -
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
    + <dependency org="velocity" name="velocity" rev="${velocity.version}" transitive="false"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/build-common.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/build-common.xml (original)
    +++ hive/trunk/build-common.xml Tue Nov 8 19:28:19 2011
    @@ -72,24 +72,7 @@
    </path>


    - <!-- IVY properties set here -->
    - <property name="build.ivy.dir" location="${build.dir.hive}/ivy"/>
    - <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib"/>
    - <property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/>
    - <property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven"/>
    - <property name="ivy.conf.dir" location="${hive.root}/ivy"/>
    <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="mvn.repo" value="http://repo2.maven.org/maven2"/>
    - <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.jar.dir" value="${build.dir.hive}/maven/jars"/>
    - <property name="mvn.pom.dir" value="${build.dir.hive}/maven/poms"/>
    - <property name="mvn.license.dir" value="${build.dir.hive}/maven/licenses"/>

    <condition property="offline">
    <istrue value="${is-offline}"/>
    @@ -107,10 +90,7 @@
    <!--this is the naming policy for artifacts we want pulled down-->
    <property name="ivy.artifact.retrieve.pattern" value="[conf]/[artifact]-[revision](-[classifier]).[ext]"/>

    - <property name="ivyresolvelog" value="download-only"/>
    - <property name="ivyretrievelog" value="quite"/>
    -
    - <target name="ivy-init">
    + <target name="ivy-init-settings">
    <!--Configure Ivy by reading in the settings file
    If anyone has already read in a settings file into this settings ID, it gets priority
    -->
    @@ -118,10 +98,12 @@
    <ivy:settings id="${ant.project.name}.ivy.settings" file="${ivysettings.xml}"/>
    </target>

    - <target name="ivy-resolve" depends="ivy-init" unless="offline">
    + <target name="ivy-resolve" depends="ivy-init-settings" unless="offline">
    <echo message="Project: ${ant.project.name}"/>
    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
    - log="${ivyresolvelog}"/>
    + conf="default" log="${ivyresolvelog}"/>
    + <ivy:report todir="${build.ivy.report.dir}" settingsRef="${ant.project.name}.ivy.settings"
    + graph="false" />
    </target>

    <target name="ivy-retrieve" depends="ivy-resolve"
    @@ -132,52 +114,15 @@
    log="${ivyresolvelog}"/>
    </target>

    - <target name="ivy-resolve-checkstyle" depends="ivy-init">
    - <echo message="Project: ${ant.project.name}"/>
    - <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
    - log="${ivyresolvelog}"/>
    - </target>
    -
    - <target name="ivy-retrieve-checkstyle" depends="ivy-resolve-checkstyle"
    - description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
    - <echo message="Project: ${ant.project.name}"/>
    - <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
    - pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
    - log="${ivyresolvelog}"/>
    - <ivy:cachepath pathid="checkstyle-classpath" conf="checkstyle"/>
    - </target>
    -
    - <target name="ivy-resolve-maven-ant-tasks" depends="ivy-init">
    - <echo message="Project: ${ant.project.name}"/>
    - <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">
    - <echo message="Project: ${ant.project.name}"/>
    - <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"
    + <target name="ivy-retrieve-hadoop-source" depends="ivy-init-settings"
    description="Retrieve Ivy-managed Hadoop source artifacts" unless="ivy.skip">
    <echo message="Project: ${ant.project.name}"/>
    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
    pattern="${build.dir.hadoop}/[artifact]-[revision].[ext]"/>
    </target>

    - <target name="ivy-docs" depends="ivy-init"
    - description="Resolve, Retrieve Ivy-managed artifacts for docs configuration">
    - <echo message="Project: ${ant.project.name}"/>
    - <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="docs"/>
    - <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
    - pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="docs"/>
    - <ivy:cachepath pathid="docs-classpath" conf="docs"/>
    - </target>
    -
    +
    <available property="hadoopcore.${hadoop.version.ant-internal}.install.done"
    file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>

    @@ -213,7 +158,6 @@
    <pathelement location="${build.dir.hive}/classes"/>
    <fileset dir="${build.dir.hive}" includes="*/*.jar"/>
    <fileset dir="${hive.root}/lib" includes="*.jar"/>
    - <fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
    <fileset dir="${build.ivy.lib.dir}/default" includes="*.jar" excludes="*hadoop*.jar"
    erroronmissingdir="false"/>
    </path>
    @@ -234,6 +178,7 @@
    </path>

    <target name="create-dirs">
    + <echo message="Project: ${ant.project.name}"/>
    <mkdir dir="${build.dir.hive}"/>
    <mkdir dir="${build.dir}"/>
    <mkdir dir="${build.classes}"/>
    @@ -263,7 +208,7 @@
    <echo message="Project: ${ant.project.name}"/>
    </target>

    - <target name="compile" depends="init, setup">
    + <target name="compile" depends="init, setup, ivy-retrieve">
    <echo message="Project: ${ant.project.name}"/>
    <javac
    encoding="${build.encoding}"
    @@ -271,7 +216,8 @@
    includes="**/*.java"
    destdir="${build.classes}"
    debug="${javac.debug}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="classpath"/>
    </javac>
    @@ -281,7 +227,7 @@
    </target>

    <target name="jar" depends="compile">
    - <echo message="Project: ${ant.project.name}"/>
    + <echo message="Project: ${ant.project.name}" />
    <jar
    jarfile="${build.dir}/hive-${ant.project.name}-${version}.jar"
    basedir="${build.classes}">
    @@ -309,7 +255,8 @@
    optimize="${javac.optimize}"
    target="${javac.version}"
    source="${javac.version}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="test.classpath"/>
    </javac>
    @@ -322,7 +269,8 @@
    optimize="${javac.optimize}"
    target="${javac.version}"
    source="${javac.version}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="test.classpath"/>
    </javac>
    @@ -339,7 +287,6 @@

    <target name="test-conditions">
    <echo message="Project: ${ant.project.name}"/>
    -
    <condition property="qfile" value="">
    <not>
    <isset property="qfile"/>
    @@ -405,7 +352,7 @@
    errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">

    <env key="HADOOP_HOME" value="${hadoop.root}"/>
    - <env key="HADOOP_CLASSPATH" value="${test.src.data.dir}/conf:${build.dir.hive}/dist/lib/derby.jar:${build.dir.hive}/dist/lib/javaewah-0.3.jar"/>
    + <env key="HADOOP_CLASSPATH" value="${test.src.data.dir}/conf:${build.dir.hive}/dist/lib/derby-${derby.version}.jar:${build.dir.hive}/dist/lib/javaewah-${javaewah.version}.jar"/>
    <env key="TZ" value="US/Pacific"/>
    <sysproperty key="test.output.overwrite" value="${overwrite}"/>
    <sysproperty key="test.service.standalone.server" value="${standalone}"/>
    @@ -424,6 +371,8 @@
    <sysproperty key="fs.default.name" value="${fs.default.name}"/>
    <sysproperty key="build.dir" value="${build.dir}"/>
    <sysproperty key="build.dir.hive" value="${build.dir.hive}"/>
    + <sysproperty key="build.ivy.lib.dir" value="${build.ivy.lib.dir}"/>
    + <sysproperty key="derby.version" value="${derby.version}"/>
    <sysproperty key="hive.version" value="${version}"/>

    <classpath refid="${test.classpath.id}"/>
    @@ -442,15 +391,6 @@
    </junit>
    <fail if="tests.failed">Tests failed!</fail>
    </target>
    -
    - <target name="test-shims">
    - <echo message="Project: ${ant.project.name}"/>
    - <subant target="test">
    - <property name="hadoop.version" value="${hadoop.security.version}"/>
    - <property name="hadoop.security.version" value="${hadoop.security.version}"/>
    - <fileset dir="${hive.root}/shims" includes="build.xml"/>
    - </subant>
    - </target>

    <target name="clean-test">
    <echo message="Project: ${ant.project.name}"/>
    @@ -476,9 +416,9 @@
    </condition>
    </target>

    - <target name="check-ivy" depends="ivy-init">
    + <target name="check-ivy" depends="ivy-init-settings">
    <echo message="Project: ${ant.project.name}"/>
    - <available file="${basedir}/ivy.xml" property="ivy.present"/>
    + <available file="${basedir}/ivy.xml" property="ivy.present"/>
    </target>

    <target name="make-pom" if="ivy.present" depends="check-ivy, jar">
    @@ -487,7 +427,7 @@

    <ivy:makepom ivyfile="${basedir}/ivy.xml" pomfile="${build.dir}/pom.xml">
    <mapping conf="default" scope="compile" />
    - <mapping conf="runtime" scope="runtime" />
    + <mapping conf="runtime" scope="compile" />
    </ivy:makepom>
    <replace file="${build.dir}/pom.xml">
    <replacetoken>&lt;dependencies&gt;</replacetoken>
    @@ -509,38 +449,4 @@
    </replace>
    </target>

    - <!-- Deploy a single artifact to the maven repository -->
    - <target name="maven-publish-artifact">
    - <echo message="Project: ${ant.project.name}"/>
    - <artifact:pom
    - file="${mvn.pom.dir}/hive-${hive.project}-${version}.pom"
    - id="hive.project.pom" />
    - <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2" />
    - <if>
    - <equals arg1="${mvn.publish.repo}" arg2="staging" />
    - <then>
    - <artifact:deploy
    - file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar">
    - <pom refid="hive.project.pom" />
    - <remoteRepository
    - id="apache.staging.https"
    - url="https://repository.apache.org/service/local/staging/deploy/maven2" />
    - <attach file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar.asc"
    - type="jar.asc"/>
    - <attach file="${mvn.pom.dir}/hive-${hive.project}-${version}.pom.asc"
    - type="pom.asc"/>
    - </artifact:deploy>
    - </then>
    - <else>
    - <artifact:deploy
    - file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar">
    - <pom refid="hive.project.pom" />
    - <remoteRepository
    - id="apache.snapshots.https"
    - url="https://repository.apache.org/content/repositories/snapshots" />
    - </artifact:deploy>
    - </else>
    - </if>
    - </target>
    -
    </project>

    Modified: hive/trunk/build.properties
    URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/build.properties (original)
    +++ hive/trunk/build.properties Tue Nov 8 19:28:19 2011
    @@ -39,9 +39,28 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
    common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar

    #
    -# Data nucleus repository - needed for jdo2-api-2.3-ec.jar download
    +# Ivy Properties
    #
    -datanucleus.repo=http://www.datanucleus.org/downloads/maven2
    +build.ivy.dir=${build.dir.hive}/ivy
    +build.ivy.lib.dir=${build.ivy.dir}/lib
    +build.ivy.report.dir=${build.ivy.dir}/report
    +build.ivy.maven.dir=${build.ivy.dir}/maven
    +ivy.conf.dir=${hive.root}/ivy
    +ivy.version=2.2.0
    +ivy.jar=${build.ivy.lib.dir}/ivy-${ivy.version}.jar
    +ivysettings.xml=${ivy.conf.dir}/ivysettings.xml
    +ivyresolvelog=download-only
    +ivy.mvn.repo=http://repo2.maven.org/maven2
    +ivy_repo_url=${ivy.mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
    +hive.ivy.org=org.apache.hive
    +mvn.publish.repo=snapshots
    +mvn.jar.dir=${build.dir.hive}/maven/jars
    +mvn.pom.dir=${build.dir.hive}/maven/poms
    +mvn.license.dir=${build.dir.hive}/maven/licenses


    +#
    +# Data nucleus repository - needed for jdo2-api-2.3-ec.jar download
    +#
    +datanucleus.repo=http://www.datanucleus.org/downloads/maven2


    Modified: hive/trunk/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/build.xml (original)
    +++ hive/trunk/build.xml Tue Nov 8 19:28:19 2011
    @@ -18,12 +18,15 @@
    -->


    -<project name="hive" default="jar" xmlns:artifact="urn:maven-artifact-ant" >
    +<project name="hive" default="jar"
    + xmlns:ivy="antlib:org.apache.ivy.ant"
    + xmlns:artifact="urn:maven-artifact-ant" >

    <property name="hive.root" location="${basedir}"/>
    <property file="${hive.root}/build.properties"/>
    <property file="${user.home}/build.properties" />
    <property file="${basedir}/build.properties" />
    + <loadproperties srcfile="${ivy.conf.dir}/libraries.properties"/>

    <property environment="env"/>

    @@ -58,6 +61,17 @@
    <isset property="offline"/>
    </condition>

    + <condition property="ivy.cache.name" value="offline" else="online">
    + <isset property="offline"/>
    + </condition>
    +
    + <condition property="ivy.skip">
    + <and>
    + <isset property="offline"/>
    + <available file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>
    + </and>
    + </condition>
    +
    <condition property="staging">
    <equals arg1="${mvn.publish.repo}" arg2="staging"/>
    </condition>
    @@ -152,7 +166,6 @@
    <pathelement location="${build.dir.hive}/classes"/>
    <fileset dir="${hive.root}" includes="hive-*.jar"/>
    <fileset dir="${hive.root}/lib" includes="*.jar"/>
    - <fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
    <fileset dir="${build.dir.hive}/ivy/lib/default" includes="*.jar"
    excludes="*hadoop*.jar" erroronmissingdir="false"/>
    </path>
    @@ -170,8 +183,14 @@
    <path refid="common-classpath"/>
    </path>

    -
    -
    + <target name="ivy-init-settings">
    + <!--Configure Ivy by reading in the settings file
    + If anyone has already read in a settings file into this settings ID, it gets priority
    + -->
    + <echo message="Project: ${ant.project.name}"/>
    + <ivy:settings id="${ant.project.name}.ivy.settings" file="${ivysettings.xml}"/>
    + </target>
    +
    <target name="ivy-init-dirs">
    <echo message="Project: ${ant.project.name}"/>
    <mkdir dir="${build.ivy.dir}" />
    @@ -192,7 +211,7 @@
    <echo message="Project: ${ant.project.name}"/>
    <get src="${ivy_repo_url}" dest="${ivy.jar}" usetimestamp="true"/>
    </target>
    -
    +
    <!--
    To avoid Ivy leaking things across big projects, always load Ivy in the same classloader.
    Also note how we skip loading Ivy if it is already there, just to make sure all is well.
    @@ -302,6 +321,15 @@
    </for>
    </target>

    + <target name="test-shims">
    + <echo message="Project: ${ant.project.name}"/>
    + <subant target="test">
    + <property name="hadoop.version" value="${hadoop.security.version}"/>
    + <property name="hadoop.security.version" value="${hadoop.security.version}"/>
    + <fileset dir="${hive.root}/shims" includes="build.xml"/>
    + </subant>
    + </target>
    +
    <!-- create an html report from junit output files -->
    <target name="testreport"
    description="Generate JUnit HTML test report">
    @@ -727,9 +755,23 @@
    <!-- Checkstyle -->
    <!-- ================================================================== -->

    - <import file="${hive.root}/build-common.xml"/>

    - <target name="checkstyle" depends="ivy-retrieve-checkstyle,check-for-checkstyle"
    + <target name="ivy-resolve-checkstyle" depends="ivy-init-settings">
    + <echo message="Project: ${ant.project.name}"/>
    + <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
    + log="${ivyresolvelog}"/>
    + </target>
    +
    + <target name="ivy-retrieve-checkstyle" depends="ivy-resolve-checkstyle"
    + description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
    + <echo message="Project: ${ant.project.name}"/>
    + <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
    + pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
    + log="${ivyresolvelog}"/>
    + <ivy:cachepath pathid="checkstyle-classpath" conf="checkstyle"/>
    + </target>
    +
    + <target name="checkstyle" depends="init,ivy-retrieve-checkstyle,check-for-checkstyle"
    if="checkstyle.present"
    description="Run Checkstyle on source files">
    <echo message="Project: ${ant.project.name}"/>
    @@ -763,6 +805,15 @@
    </available>
    </target>

    + <target name="ivy-docs" depends="ivy-init-settings"
    + description="Resolve, Retrieve Ivy-managed artifacts for docs configuration">
    + <echo message="Project: ${ant.project.name}"/>
    + <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="docs"/>
    + <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
    + pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="docs"/>
    + <ivy:cachepath pathid="docs-classpath" conf="docs"/>
    + </target>
    +
    <target name="docs-anakia" depends="ivy-docs">
    <echo message="Project: ${ant.project.name}"/>
    <echo message="Building xdocs with anakia"/>
    @@ -792,6 +843,22 @@

    <!-- Prepare for maven deploy i.e. jars, poms, and licence -->

    + <target name="ivy-resolve-maven-ant-tasks" depends="ivy-init-settings">
    + <echo message="Project: ${ant.project.name}"/>
    + <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">
    + <echo message="Project: ${ant.project.name}"/>
    + <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="mvn-taskdef" depends="ivy-retrieve-maven-ant-tasks">
    <echo message="Project: ${ant.project.name}"/>
    <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
    @@ -889,7 +956,42 @@
    </echo>
    </target>

    - <target name="maven-publish" depends="mvn-taskdef,maven-sign"
    + <!-- Deploy a single artifact to the maven repository -->
    + <target name="maven-publish-artifact">
    + <echo message="Project: ${ant.project.name}"/>
    + <artifact:pom
    + file="${mvn.pom.dir}/hive-${hive.project}-${version}.pom"
    + id="hive.project.pom" />
    + <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2" />
    + <if>
    + <equals arg1="${mvn.publish.repo}" arg2="staging" />
    + <then>
    + <artifact:deploy
    + file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar">
    + <pom refid="hive.project.pom" />
    + <remoteRepository
    + id="apache.staging.https"
    + url="https://repository.apache.org/service/local/staging/deploy/maven2" />
    + <attach file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar.asc"
    + type="jar.asc"/>
    + <attach file="${mvn.pom.dir}/hive-${hive.project}-${version}.pom.asc"
    + type="pom.asc"/>
    + </artifact:deploy>
    + </then>
    + <else>
    + <artifact:deploy
    + file="${mvn.jar.dir}/hive-${hive.project}-${version}.jar">
    + <pom refid="hive.project.pom" />
    + <remoteRepository
    + id="apache.snapshots.https"
    + url="https://repository.apache.org/content/repositories/snapshots" />
    + </artifact:deploy>
    + </else>
    + </if>
    + </target>
    +
    +
    + <target name="maven-publish" depends="init,mvn-taskdef,maven-sign"
    description="Publish Maven artifacts">
    <echo message="Project: ${ant.project.name}"/>
    <antcall target="maven-publish-artifact">

    Modified: hive/trunk/cli/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/cli/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/cli/build.xml (original)
    +++ hive/trunk/cli/build.xml Tue Nov 8 19:28:19 2011
    @@ -35,7 +35,8 @@ to call at top-level: ant deploy-contrib
    includes="**/*.java"
    destdir="${build.classes}"
    debug="${javac.debug}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="classpath"/>
    </javac>

    Modified: hive/trunk/cli/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/cli/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/cli/ivy.xml (original)
    +++ hive/trunk/cli/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -16,20 +16,46 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
    - <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}" />
    - <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    - transitive="false"/>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <!-- Runtime Dependencies -->
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
    + <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + <dependency org="jline" name="jline" rev="${jline.version}"
    + transitive="false"/>
    + <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    + transitive="false"/>
    +
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-service" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
    + conf="runtime" transitive="false"/>
    +
    + <!-- Test Dependencies -->
    + <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}" />
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/common/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/common/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/common/build.xml (original)
    +++ hive/trunk/common/build.xml Tue Nov 8 19:28:19 2011
    @@ -35,7 +35,8 @@ to call at top-level: ant deploy-contrib
    includes="**/*.java"
    destdir="${build.classes}"
    debug="${javac.debug}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="classpath"/>
    </javac>

    Modified: hive/trunk/common/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/common/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/common/ivy.xml (original)
    +++ hive/trunk/common/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -16,17 +16,29 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
    + <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + <dependency org="log4j" name="log4j" rev="${log4j.version}"
    + transitive="false"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/contrib/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/contrib/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/contrib/build.xml (original)
    +++ hive/trunk/contrib/build.xml Tue Nov 8 19:28:19 2011
    @@ -59,7 +59,7 @@
    <target name="gen-test" depends="test-conditions, test-init" >
    <echo message="Project: ${ant.project.name}"/>
    <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
    - classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar"/>
    + classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar"/>

    <mkdir dir="${test.build.src}/org/apache/hadoop/hive/ql/parse"/>
    <mkdir dir="${test.build.src}/org/apache/hadoop/hive/cli"/>

    Modified: hive/trunk/contrib/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/contrib/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/contrib/ivy.xml (original)
    +++ hive/trunk/contrib/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -15,17 +15,35 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    -
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + <dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}"
    + transitive="false"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/contrib/src/test/queries/clientpositive/dboutput.q
    URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/queries/clientpositive/dboutput.q?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/contrib/src/test/queries/clientpositive/dboutput.q (original)
    +++ hive/trunk/contrib/src/test/queries/clientpositive/dboutput.q Tue Nov 8 19:28:19 2011
    @@ -1,4 +1,4 @@
    -add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
    +ADD JAR ${system:build.dir}/hive-contrib-${system:hive.version}.jar;

    CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput';

    @@ -7,7 +7,7 @@ set mapred.reduce.tasks.speculative.exec
    set mapred.map.tasks=1;
    set mapred.reduce.tasks=1;

    -ADD JAR ../lib/derby.jar ;
    +ADD JAR ${system:build.ivy.lib.dir}/default/derby-${system:derby.version}.jar;

    DESCRIBE FUNCTION dboutput;


    Modified: hive/trunk/eclipse-templates/.classpath
    URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/.classpath?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/eclipse-templates/.classpath (original)
    +++ hive/trunk/eclipse-templates/.classpath Tue Nov 8 19:28:19 2011
    @@ -7,22 +7,22 @@
    <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/@SERVLETAPIJAR@"/>
    <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/@JETTYJAR@"/>
    <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/@JETTYUTILJAR@"/>
    - <classpathentry exported="true" kind="lib" path="cli/lib/jline-@jline.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/json.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/asm-@asm.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/jline-@jline.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/json-@json.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/asm-@asm.version@.jar"/>
    <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/lib/commons-codec-@commons-codec.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/commons-lang-@commons-lang.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/commons-logging-@commons-logging.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/commons-logging-api-@commons-logging-api.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/commons-lang-@commons-lang.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/commons-logging-@commons-logging.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/commons-logging-api-@commons-logging-api.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/derby-@derby.version@.jar"/>
    <classpathentry exported="true" kind="lib" path="build/dist/lib/hbase-@hbase.version@.jar"/>
    <classpathentry exported="true" kind="lib" path="build/dist/lib/hbase-@hbase-test.version@-tests.jar"/>
    <classpathentry exported="true" kind="lib" path="build/dist/lib/libfb303-@libfb303.version@.jar"/>
    <classpathentry exported="true" kind="lib" path="build/dist/lib/libthrift-@libthrift.version@.jar"/>
    <classpathentry exported="true" kind="lib" path="build/dist/lib/zookeeper-@zookeeper.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="lib/log4j-@log4j.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="ql/lib/antlr-@antlr.version@.jar"/>
    - <classpathentry exported="true" kind="lib" path="ql/lib/antlr-runtime-@antlr-runtime.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/log4j-@log4j.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/antlr-@antlr.version@.jar"/>
    + <classpathentry exported="true" kind="lib" path="build/dist/lib/antlr-runtime-@antlr-runtime.version@.jar"/>
    <classpathentry exported="true" kind="lib" path="testlibs/junit-@junit.version@.jar"/>
    <classpathentry kind="lib" path="build/dist/lib/jdo2-api-@jdo-api.version@.jar"/>
    <classpathentry kind="lib" path="build/dist/lib/datanucleus-core-@datanucleus-core.version@.jar"/>
    @@ -35,7 +35,7 @@
    <classpathentry kind="lib" path="build/dist/lib/commons-pool-@commons-pool.version@.jar"/>
    <classpathentry kind="lib" path="build/dist/lib/slf4j-api-@slf4j-api.version@.jar"/>
    <classpathentry kind="lib" path="build/dist/lib/slf4j-log4j12-@slf4j-log4j12.version@.jar"/>
    - <classpathentry kind="lib" path="build/dist/lib/javaewah-0.3.jar"/>
    + <classpathentry kind="lib" path="build/dist/lib/javaewah-@javaewah.version@.jar"/>
    <classpathentry kind="lib" path="build/dist/lib/mockito-all-@mockito-all.version@.jar"/>
    <classpathentry kind="src" path="build/contrib/test/src"/>
    <classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>

    Modified: hive/trunk/hbase-handler/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/hbase-handler/build.xml (original)
    +++ hive/trunk/hbase-handler/build.xml Tue Nov 8 19:28:19 2011
    @@ -63,7 +63,7 @@
    <target name="gen-test" depends="test-conditions, test-init" >
    <echo message="Project: ${ant.project.name}"/>
    <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
    - classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar"/>
    + classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar"/>

    <mkdir dir="${test.build.src}/org/apache/hadoop/hive/cli"/>
    <mkdir dir="${test.log.dir}/hbase-handler"/>

    Modified: hive/trunk/hbase-handler/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/hbase-handler/ivy.xml (original)
    +++ hive/trunk/hbase-handler/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -14,18 +14,42 @@
    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-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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    -
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - </dependencies>
    +<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + <dependency org="log4j" name="log4j" rev="${log4j.version}"
    + transitive="false"/>
    + <dependency org="org.apache.hbase" name="hbase" rev="${hbase.version}"
    + transitive="false">
    + <artifact name="hbase" type="jar"/>
    + <artifact name="hbase" type="test-jar" ext="jar"
    + m:classifier="tests"/>
    + </dependency>
    + <dependency org="org.apache.zookeeper" name="zookeeper" rev="${zookeeper.version}"
    + transitive="false"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/hwi/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/hwi/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/hwi/build.xml (original)
    +++ hive/trunk/hwi/build.xml Tue Nov 8 19:28:19 2011
    @@ -61,7 +61,7 @@
    We include the war target as a dependency. In this way the war target
    is called without changes to the upstream build infrastructure.
    -->
    - <target name="compile" depends="init, install-hadoopcore, setup, war">
    + <target name="compile" depends="init, setup, ivy-retrieve, war">
    <echo message="Project: ${ant.project.name}"/>
    <javac
    encoding="${build.encoding}"

    Modified: hive/trunk/hwi/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/hwi/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/hwi/ivy.xml (original)
    +++ hive/trunk/hwi/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -15,17 +15,31 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    -
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-cli" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ivy.xml (original)
    +++ hive/trunk/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -23,11 +23,7 @@
    </info>

    <configurations defaultconfmapping="default">
    - <!--these match the Maven configurations-->
    - <conf name="default" extends="master,runtime"/>
    - <conf name="master" description="contains the artifact but no dependencies"/>
    - <conf name="compile" description="contains the artifact but no dependencies"/>
    - <conf name="runtime" description="runtime but not the artifact"/>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    <!-- Private configurations -->
    <conf name="docs" visibility="private"/>
    <conf name="checkstyle" visibility="private"/>

    Added: hive/trunk/ivy/common-configurations.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ivy/common-configurations.xml?rev=1199399&view=auto
    ==============================================================================
    --- hive/trunk/ivy/common-configurations.xml (added)
    +++ hive/trunk/ivy/common-configurations.xml Tue Nov 8 19:28:19 2011
    @@ -0,0 +1,23 @@
    +<!--
    + 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.
    +-->
    +<configurations defaultconfmapping="default">
    + <!--these match the Maven configurations-->
    + <conf name="default" extends="master,compile"/>
    + <conf name="master" description="contains the artifact but no dependencies"/>
    + <conf name="compile" description="contains the artifact but no dependencies"/>
    + <conf name="runtime" description="runtime but not the artifact"/>
    +</configurations>
    \ No newline at end of file

    Modified: hive/trunk/ivy/ivysettings.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ivy/ivysettings.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ivy/ivysettings.xml (original)
    +++ hive/trunk/ivy/ivysettings.xml Tue Nov 8 19:28:19 2011
    @@ -61,11 +61,11 @@
    </filesystem>

    <chain name="default" dual="true" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
    - <resolver ref="hadoop-source"/>
    - <resolver ref="hadoop-source2"/>
    <resolver ref="apache-snapshot"/>
    <resolver ref="maven2"/>
    <resolver ref="datanucleus-repo"/>
    + <resolver ref="hadoop-source"/>
    + <resolver ref="hadoop-source2"/>
    </chain>

    <chain name="internal" dual="true">

    Modified: hive/trunk/ivy/libraries.properties
    URL: http://svn.apache.org/viewvc/hive/trunk/ivy/libraries.properties?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ivy/libraries.properties (original)
    +++ hive/trunk/ivy/libraries.properties Tue Nov 8 19:28:19 2011
    @@ -18,6 +18,7 @@

    # These are the versions of our dependencies (in alphabetical order)
    apacheant.version=1.7.1
    +ant-contrib.version=1.0b3
    ant-task.version=2.0.10
    antlr.version=3.0.1
    antlr-runtime.version=3.0.1
    @@ -35,19 +36,23 @@ commons-lang.version=2.4
    commons-logging.version=1.0.4
    commons-logging-api.version=1.0.4
    commons-pool.version=1.5.4
    +derby.version=10.4.2.0
    +guava.version=r06
    hbase.version=0.89.0-SNAPSHOT
    hbase-test.version=0.89.0-SNAPSHOT
    -ivy.version=2.1.0
    +javaewah.version=0.3
    jdo-api.version=2.3-ec
    jdom.version=1.1
    jline.version=0.9.94
    +json.version=20090211
    junit.version=4.10
    libfb303.version=0.7.0
    libthrift.version=0.7.0
    -log4j.version=1.2.15
    +log4j.version=1.2.16
    maven-ant-tasks.version=2.1.0
    mockito-all.version=1.8.2
    slf4j-api.version=1.6.1
    slf4j-log4j12.version=1.6.1
    +velocity.version=1.5
    zookeeper.version=3.3.1
    -guava.version=r06
    +

    Modified: hive/trunk/jdbc/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/jdbc/build.xml (original)
    +++ hive/trunk/jdbc/build.xml Tue Nov 8 19:28:19 2011
    @@ -40,23 +40,20 @@
    <path refid="classpath"/>
    </path>

    - <target name="core-compile" depends="init">
    + <target name="compile" depends="init,ivy-retrieve">
    <echo message="Project: ${ant.project.name}"/>
    <javac
    - encoding="${build.encoding}"
    - srcdir="${src.dir}/java"
    - includes="**/*.java"
    - destdir="${build.classes}"
    - debug="${javac.debug}"
    - deprecation="${javac.deprecation}"
    - >
    + encoding="${build.encoding}"
    + srcdir="${src.dir}/java"
    + includes="**/*.java"
    + destdir="${build.classes}"
    + debug="${javac.debug}"
    + deprecation="${javac.deprecation}"
    + includeantruntime="false"
    + >
    <classpath refid="classpath"/>
    </javac>
    </target>
    -
    - <target name="compile" depends="core-compile">
    - <echo message="Project: ${ant.project.name}"/>
    - </target>

    <target name="clean">
    <echo message="Project: ${ant.project.name}"/>

    Modified: hive/trunk/jdbc/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/jdbc/ivy.xml (original)
    +++ hive/trunk/jdbc/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -16,15 +16,28 @@
    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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    - <dependencies>
    - <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    - transitive="false"/>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-service" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/lib/README
    URL: http://svn.apache.org/viewvc/hive/trunk/lib/README?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/lib/README (original)
    +++ hive/trunk/lib/README Tue Nov 8 19:28:19 2011
    @@ -1,14 +1,4 @@
    Folowing is the list of external jars contained in this directory and the sources from where they were obtained:
    ---------------------------------------------------------------------------------------------------------------

    -* jpox-core-1.2.2.jar - http://www.jpox.org/docs/download.html
    -* derby.jar - http://db.apache.org/derby/derby_downloads.html
    -* asm-3.1.jar - http://forge.objectweb.org/projects/asm/
    -* jpox-enhancer-1.2.2.jar - http://www.jpox.org/docs/download.html
    -* jdo2-api-2.1.jar - http://db.apache.org/jdo/downloads.html
    -* jpox-rdbms-1.2.2.jar - http://www.jpox.org/docs/download.html
    -* velocity-1.5.jar - http://velocity.apache.org/engine/releases/velocity-1.5/
    -* commons-collections-3.2.1.jar - http://commons.apache.org/downloads/download_collections.cgi
    -* commons-lang-2.4.jar - http://commons.apache.org/downloads/download_lang.cgi
    -* json.jar - http://www.json.org/java/index.html
    -* javaewah-0.2.jar - http://code.google.com/p/javaewah/downloads/
    +* javaewah-0.3.jar - http://code.google.com/p/javaewah/downloads/

    Modified: hive/trunk/metastore/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/metastore/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/metastore/build.xml (original)
    +++ hive/trunk/metastore/build.xml Tue Nov 8 19:28:19 2011
    @@ -36,10 +36,10 @@
    <mapper type="merge" to="${build.dir}/gen/antlr/gen-java/org/apache/hadoop/hive/metastore/parser/FilterParser.java"/>
    </uptodate>

    - <target name="build-grammar" unless="grammarBuild.notRequired">
    + <target name="build-grammar" unless="grammarBuild.notRequired" depends="ivy-retrieve">
    <echo message="Project: ${ant.project.name}"/>
    <echo>Building Grammar ${src.dir}/java/org/apache/hadoop/hive/metastore/parser/Filter.g ....</echo>
    - <java classname="org.antlr.Tool" classpathref="classpath" fork="false">
    + <java classname="org.antlr.Tool" classpathref="classpath" fork="false" failonerror="true">
    <arg value="-fo" />
    <arg value="${build.dir}/gen/antlr/gen-java/org/apache/hadoop/hive/metastore/parser" />
    <arg value="${src.dir}/java/org/apache/hadoop/hive/metastore/parser/Filter.g" />
    @@ -60,7 +60,7 @@
    destdir="${build.classes}"
    debug="${javac.debug}"
    deprecation="${javac.deprecation}"
    - >
    + includeantruntime="false">
    <classpath refid="classpath"/>
    </javac>
    </target>
    @@ -71,7 +71,11 @@

    <target name="model-compile" depends="init">
    <echo message="Project: ${ant.project.name}"/>
    - <javac srcdir="${model.dir}" destdir="${build.classes}" debug="${javac.debug}">
    + <javac
    + srcdir="${model.dir}"
    + destdir="${build.classes}"
    + debug="${javac.debug}"
    + includeantruntime="false">
    <classpath refid="classpath"/>
    </javac>
    <!-- ORM data for model -->

    Modified: hive/trunk/metastore/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/metastore/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/metastore/ivy.xml (original)
    +++ hive/trunk/metastore/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -15,66 +15,57 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
    - <dependency org="commons-dbcp" name="commons-dbcp" rev="${commons-dbcp.version}">
    - <exclude module="commons-pool" />
    - <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
    - </dependency>
    - <dependency org="commons-pool" name="commons-pool" rev="${commons-pool.version}"/>
    - <dependency org="org.datanucleus" name="datanucleus-connectionpool" rev="${datanucleus-connectionpool.version}">
    - <exclude module="proxool" />
    - <exclude module="c3p0" />
    - <exclude module="datanucleus-core" />
    - <exclude module="datanucleus-rdbms" />
    - <exclude module="commons-collections" />
    - <exclude module="commons-pool" />
    - <exclude module="commons-dbcp" />
    - <exclude org="com.jolbox" module="bonecp"/>
    - </dependency>
    - <dependency org="org.datanucleus" name="datanucleus-core" rev="${datanucleus-core.version}">
    - <exclude org="javax.jdo" module="jdo2-api"/>
    - <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
    - <exclude org="org.eclipse.equinox" module="org.eclipse.equinox.registry"/>
    - <exclude org="org.eclipse.equinox" module="org.eclipse.equinox.common"/>
    - <exclude org="org.eclipse.core" module="org.eclipse.core.runtime"/>
    - <exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
    - <exclude org="log4j" module="log4j"/>
    - </dependency>
    - <dependency org="org.datanucleus" name="datanucleus-enhancer" rev="${datanucleus-enhancer.version}">
    - <exclude org="org.datanucleus" module="datanucleus-core"/>
    - <exclude org="javax.jdo" module="jdo2-api"/>
    - <exclude org="asm" module="asm"/>
    - <exclude org="org.apache.ant" module="ant"/>
    - </dependency>
    - <dependency org="org.datanucleus" name="datanucleus-rdbms" rev="${datanucleus-rdbms.version}">
    - <exclude org="org.datanucleus" module="datanucleus-core"/>
    - <exclude org="javax.jdo" module="jdo2-api"/>
    - <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
    - <exclude org="org.datanucleus" module="datanucleus-thirdparty"/>
    - <exclude org="org.apache.ant" module="ant"/>
    - <exclude org="oracle" module="ojdbc14_g"/>
    - </dependency>
    - <dependency org="javax.jdo" name="jdo2-api" rev="${jdo-api.version}">
    - <exclude org="javax.transaction" module="jta"/>
    - <exclude org="org.apache.ant" module="ant"/>
    - <exclude org="org.apache.geronimo.specs" module="geronimo-jpa_3.0_spec"/>
    - </dependency>
    - <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
    - <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"/>
    - <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    - transitive="false"/>
    - <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
    - transitive="false"/>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.antlr" name="antlr" rev="${antlr.version}"/>
    + <dependency org="org.antlr" name="antlr-runtime" rev="${antlr-runtime.version}"/>
    + <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
    + <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + <dependency org="commons-dbcp" name="commons-dbcp" rev="${commons-dbcp.version}">
    + <exclude module="commons-pool" />
    + <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
    + </dependency>
    + <dependency org="commons-pool" name="commons-pool" rev="${commons-pool.version}"/>
    + <dependency org="org.datanucleus" name="datanucleus-connectionpool" rev="${datanucleus-connectionpool.version}"
    + transitive="false"/>
    + <dependency org="org.datanucleus" name="datanucleus-core" rev="${datanucleus-core.version}"
    + transitive="false"/>
    + <dependency org="org.datanucleus" name="datanucleus-enhancer" rev="${datanucleus-enhancer.version}"
    + transitive="false"/>
    + <dependency org="org.datanucleus" name="datanucleus-rdbms" rev="${datanucleus-rdbms.version}"
    + transitive="false"/>
    + <dependency org="javax.jdo" name="jdo2-api" rev="${jdo-api.version}"
    + transitive="false"/>
    + <dependency org="org.apache.derby" name="derby" rev="${derby.version}"/>
    + <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
    + <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
    + transitive="false"/>
    + <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    + transitive="false"/>
    + <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
    + transitive="false"/>
    + <dependency org="asm" name="asm" rev="${asm.version}"/>
    + </dependencies>
    </ivy-module>

    Added: hive/trunk/odbc/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/odbc/ivy.xml?rev=1199399&view=auto
    ==============================================================================
    --- hive/trunk/odbc/ivy.xml (added)
    +++ hive/trunk/odbc/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -0,0 +1,34 @@
    +<?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-odbc" 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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <!-- THIS POM IS NOT PUBLISHED! IT EXISTS ONLY TO KEEP IVY/ANT HAPPY DURING THE BUILD.
    + PLEASE IGNORE.
    + -->
    + </dependencies>
    +</ivy-module>

    Modified: hive/trunk/pdk/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/pdk/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/pdk/build.xml (original)
    +++ hive/trunk/pdk/build.xml Tue Nov 8 19:28:19 2011
    @@ -27,7 +27,7 @@
    <path refid="classpath"/>
    </path>

    - <target name="compile" depends="init, setup">
    + <target name="compile" depends="init, setup, ivy-retrieve">
    <echo message="Project: ${ant.project.name}"/>
    <javac
    encoding="${build.encoding}"
    @@ -35,7 +35,8 @@
    includes="**/*.java"
    destdir="${build.classes}"
    debug="${javac.debug}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="classpath-pdk"/>
    </javac>

    Modified: hive/trunk/pdk/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/pdk/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/pdk/ivy.xml (original)
    +++ hive/trunk/pdk/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -16,13 +16,16 @@
    limitations under the License.
    -->
    <ivy-module version="2.0">
    - <info organisation="${hive.ivy.org}" module="hive-pdk" 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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    - <dependencies>
    - </dependencies>
    + <info organisation="${hive.ivy.org}" module="hive-pdk" 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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/ql/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ql/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ql/build.xml (original)
    +++ hive/trunk/ql/build.xml Tue Nov 8 19:28:19 2011
    @@ -38,7 +38,6 @@
    <pathelement location="${hadoop.conf.dir}"/>
    <pathelement location="${test.src.data.dir}/conf"/>
    <pathelement location="${hive.conf.dir}"/>
    - <pathelement location="${hive.root}/cli/lib/jline-0.9.94.jar"/>
    <pathelement location="${hadoop.oldstyle-name.test.jar}"/>
    <pathelement location="${hadoop.newstyle-name.test.jar}"/>
    <pathelement location="${jetty.test.jar}"/>
    @@ -47,7 +46,7 @@
    <pathelement location="${jasperc.test.jar}"/>
    <pathelement location="${jsp.test.jar}"/>
    <pathelement location="${common.jar}"/>
    - <pathelement location="${hive.root}/lib/derby.jar"/>
    + <pathelement location="${hive.root}/build/ivy/lib/default/derby-${derby.version}.jar"/>
    <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
    <fileset dir="${hadoop.root}/lib" includes="*.jar"/>
    <fileset dir="${hadoop.root}/lib" includes="jsp-2.1/*.jar"/>
    @@ -55,7 +54,7 @@
    </path>

    <target name="thriftif" depends="check-thrift-home">
    - <echo message="Project: ${ant.project.name}"/>
    + <echo message="${ant.project.name}"/>
    <fail unless="thrift.home">You must set the 'thrift.home' property!</fail>
    <echo>Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/queryplan.thrift</echo>
    <exec executable="${thrift.home}/bin/thrift" failonerror="true" dir=".">
    @@ -64,9 +63,9 @@
    </target>

    <target name="gen-test" depends="test-conditions, test-init" >
    - <echo message="Project: ${ant.project.name}"/>
    + <echo message="${ant.project.name}"/>
    <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
    - classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar:${hive.root}/lib/derby.jar"/>
    + classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar:${build.ivy.lib.dir}/default/derby-${derby.version}.jar"/>

    <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/ql/parse"
    templatePath="${ql.test.template.dir}" template="TestParse.vm"
    @@ -171,7 +170,7 @@
    <mkdir dir="${build.dir}/gen/antlr/gen-java/org/apache/hadoop/hive/ql/parse"/>
    </target>

    - <target name="compile" depends="init, ql-init, build-grammar, ivy-retrieve">
    + <target name="compile" depends="init, ql-init, ivy-retrieve, build-grammar">
    <echo message="Project: ${ant.project.name}"/>
    <javac
    encoding="${build.encoding}"
    @@ -179,7 +178,8 @@
    includes="**/*.java"
    destdir="${build.classes}"
    debug="${javac.debug}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="classpath"/>
    </javac>
    @@ -198,18 +198,24 @@
    <exclude name="META-INF/MANIFEST.MF"/>
    </patternset>
    </unzip>
    - <unzip src="${hive.root}/lib/commons-lang-2.4.jar" dest="${build.dir.hive}/commons-lang/classes">
    + <unzip src="${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar" dest="${build.dir.hive}/commons-lang/classes">
    <patternset>
    <exclude name="META-INF"/>
    <exclude name="META-INF/MANIFEST.MF"/>
    </patternset>
    </unzip>
    - <unzip src="${hive.root}/lib/json.jar" dest="${build.dir.hive}/json/classes">
    + <unzip src="${build.ivy.lib.dir}/default/json-${json.version}.jar" dest="${build.dir.hive}/json/classes">
    <patternset>
    <exclude name="META-INF"/>
    <exclude name="META-INF/MANIFEST.MF"/>
    </patternset>
    </unzip>
    + <unzip src="${hive.root}/lib/javaewah-${javaewah.version}.jar" dest="${build.dir.hive}/javaewah/classes">
    + <patternset>
    + <exclude name="meta-inf"/>
    + <exclude name="meta-inf/manifest.mf"/>
    + </patternset>
    + </unzip>
    <!-- jar jarfile="${build.dir}/hive_${name}.jar" basedir="${build.classes}" / -->
    <jar jarfile="${build.dir}/hive-exec-${version}.jar">
    <fileset dir="${build.dir.hive}/common/classes" includes="**/*.class"/>
    @@ -219,6 +225,7 @@
    <fileset dir="${build.dir.hive}/commons-lang/classes" includes="**/StringUtils.class,**/WordUtils.class"/>
    <fileset dir="${build.dir.hive}/json/classes" includes="**/*.class"/>
    <fileset dir="${build.dir.hive}/shims/classes" includes="**/*.class"/>
    + <fileset dir="${build.dir.hive}/javaewah/classes" includes="**/*.class"/>
    <manifest>
    <!-- Not putting these in their own manifest section, since that inserts
    a new-line, which breaks the reading of the attributes. -->
    @@ -232,7 +239,7 @@

    <!-- Override deploy since we are deploying hive_exec and not hive_ql -->
    <target name="deploy" depends="jar">
    - <echo message="Project: ${ant.project.name}"/>
    + <echo message="${ant.project.name}"/>
    <mkdir dir="${deploy.dir}"/>
    <copy file="${build.dir}/hive-exec-${version}.jar"
    todir="${deploy.dir}"/>

    Modified: hive/trunk/ql/ivy.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/ql/ivy.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ql/ivy.xml (original)
    +++ hive/trunk/ql/ivy.xml Tue Nov 8 19:28:19 2011
    @@ -15,32 +15,50 @@
    limitations under the License.
    -->
    <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
    - <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">
    - The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    - https://cwiki.apache.org/confluence/display/Hive/Home
    - </description>
    - </info>
    - <dependencies>
    - <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    - <artifact name="hadoop" type="source" ext="tar.gz"/>
    - </dependency>
    - <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
    - <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"/>
    - <dependency org="org.apache.hbase" name="hbase" rev="${hbase.version}"
    - transitive="false">
    - <artifact name="hbase" type="jar"/>
    - <artifact name="hbase" type="test-jar" ext="jar"
    - m:classifier="tests"/>
    - </dependency>
    - <dependency org="org.apache.zookeeper" name="zookeeper"
    - rev="${zookeeper.version}" transitive="false">
    - <include type="jar"/>
    - </dependency>
    - <dependency org="com.google.guava" name="guava" rev="${guava.version}"
    - transitive="false"/>
    - <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    - transitive="false"/>
    - </dependencies>
    + <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">
    + The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
    + https://cwiki.apache.org/confluence/display/Hive/Home
    + </description>
    + </info>
    + <configurations>
    + <include file="${ivy.conf.dir}/common-configurations.xml"/>
    + </configurations>
    + <dependencies>
    + <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
    + <artifact name="hadoop" type="source" ext="tar.gz"/>
    + </dependency>
    + <dependency org="org.apache.hive" name="hive-common" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
    + conf="runtime" transitive="false"/>
    + <dependency org="org.antlr" name="antlr" rev="${antlr.version}"
    + transitive="false"/>
    + <dependency org="org.antlr" name="antlr-runtime" rev="${antlr-runtime.version}"/>
    + <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
    + <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
    + transitive="false"/>
    + <dependency org="org.apache.zookeeper" name="zookeeper"
    + rev="${zookeeper.version}" transitive="false">
    + <include type="jar"/>
    + </dependency>
    + <dependency org="com.google.guava" name="guava" rev="${guava.version}"
    + transitive="false"/>
    + <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
    + transitive="false"/>
    + <dependency org="log4j" name="log4j" rev="${log4j.version}" transitive="false"/>
    + <dependency org="org.json" name="json" rev="${json.version}"/>
    + <dependency org="commons-collections" name="commons-collections" rev="${commons-collections.version}"/>
    + <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
    + <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
    + transitive="false"/>
    + <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
    + transitive="false"/>
    + <dependency org="org.apache.derby" name="derby" rev="${derby.version}"/>
    + </dependencies>
    </ivy-module>

    Modified: hive/trunk/ql/src/test/queries/clientpositive/set_processor_namespaces.q
    URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/set_processor_namespaces.q?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ql/src/test/queries/clientpositive/set_processor_namespaces.q (original)
    +++ hive/trunk/ql/src/test/queries/clientpositive/set_processor_namespaces.q Tue Nov 8 19:28:19 2011
    @@ -24,9 +24,8 @@ set b=a;
    set c=${hiveconf:${hiveconf:b}};
    set c;

    -set jar=../lib/derby.jar;
    +set jar=${system:build.ivy.lib.dir}/default/derby-${system:derby.version}.jar;

    add file ${hiveconf:jar};
    -list file;
    delete file ${hiveconf:jar};
    list file;

    Modified: hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
    URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out (original)
    +++ hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out Tue Nov 8 19:28:19 2011
    @@ -47,13 +47,12 @@ STAGE PLANS:
    PREHOOK: query: SELECT * FROM src where key=5
    PREHOOK: type: QUERY
    PREHOOK: Input: default@src
    -PREHOOK: Output: file:/tmp/sdong/hive_2011-02-10_17-07-36_889_4709058180675925800/-mr-10000
    +PREHOOK: Output: file:/tmp/carl/hive_2011-11-04_15-25-57_635_7657597640646099982/-mr-10000
    POSTHOOK: query: SELECT * FROM src where key=5
    POSTHOOK: type: QUERY
    POSTHOOK: Input: default@src
    -POSTHOOK: Output: file:/tmp/sdong/hive_2011-02-10_17-07-36_889_4709058180675925800/-mr-10000
    +POSTHOOK: Output: file:/tmp/carl/hive_2011-11-04_15-25-57_635_7657597640646099982/-mr-10000
    5 val_5
    5 val_5
    5 val_5
    c=1
    -../lib/derby.jar

    Modified: hive/trunk/serde/build.xml
    URL: http://svn.apache.org/viewvc/hive/trunk/serde/build.xml?rev=1199399&r1=1199398&r2=1199399&view=diff
    ==============================================================================
    --- hive/trunk/serde/build.xml (original)
    +++ hive/trunk/serde/build.xml Tue Nov 8 19:28:19 2011
    @@ -17,11 +17,6 @@
    limitations under the License.
    -->

    -
    -<!--
    -Before you can run these subtargets directly, you need
    -to call at top-level: ant deploy-contrib compile-core-test
    --->
    <project name="serde" default="jar">

    <property name="src.dir" location="${basedir}/src"/>
    @@ -42,14 +37,15 @@ to call at top-level: ant deploy-contrib
    />
    </target>

    - <target name="compile" depends="init,dynamic-serde,ivy-retrieve">
    + <target name="compile" depends="init,ivy-retrieve,dynamic-serde">
    <echo message="Project: ${ant.project.name}"/>
    <javac
    encoding="${build.encoding}"
    srcdir="${src.dir}/java/:${src.dir}/gen/thrift/gen-javabean/:${src.dir}/gen/protobuf/gen-java/"
    destdir="${build.classes}"
    debug="${javac.debug}"
    - deprecation="${javac.deprecation}">
    + deprecation="${javac.deprecation}"
    + includeantruntime="false">
    <compilerarg line="${javac.args} ${javac.args.warnings}" />
    <classpath refid="classpath"/>
    </javac>

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupcommits @
categorieshive, hadoop
postedNov 8, '11 at 7:28p
activeNov 8, '11 at 7:28p
posts2
users1
websitehive.apache.org

1 user in discussion

Jvs: 2 posts

People

Translate

site design / logo © 2021 Grokbase