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>
