diff --git ant/build.xml ant/build.xml index 17b3c3a..c4351d0 100644 --- ant/build.xml +++ ant/build.xml @@ -27,10 +27,12 @@ to call at top-level: ant deploy-contrib compile-core-test - + + + - + + diff --git build-common.xml build-common.xml index 9a738c9..ca5d938 100644 --- build-common.xml +++ build-common.xml @@ -71,11 +71,6 @@ - - - - - @@ -92,8 +87,9 @@ - - + + + @@ -111,76 +107,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - You need Apache Ivy 2.1 or later from http://ant.apache.org/ - It could not be loaded from ${ivy_repo_url} - - - - - + + + + + + @@ -188,12 +148,14 @@ + + @@ -202,12 +164,14 @@ + + @@ -219,16 +183,19 @@ + + + @@ -277,9 +244,12 @@ - + + + + @@ -289,10 +259,12 @@ - + + + - + - + @@ -326,6 +298,7 @@ + + @@ -364,6 +338,7 @@ + @@ -403,26 +378,11 @@ - - - - - + + - - - - - - - - - - - @@ -437,14 +397,13 @@ + - + @@ -483,7 +442,9 @@ Tests failed! + + @@ -492,17 +453,19 @@ + - + + @@ -514,10 +477,12 @@ + + Writing POM to ${build.dir}/pom.xml @@ -544,23 +509,38 @@ - - - - - + + - - - - - + + + + + + + + + + + + + + + + + diff --git build.xml build.xml index 13b09c1..20494ca 100644 --- build.xml +++ build.xml @@ -58,6 +58,16 @@ + + + + + + + + + + @@ -160,17 +170,84 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + You need Apache Ivy 2.1 or later from http://ant.apache.org/ + It could not be loaded from ${ivy_repo_url} + + + + + + + + + + + + + + + + + + + + + + + + + You must set thrift.home to the absolute path of your local Thrift installation. @@ -180,28 +257,35 @@ + + + + + + @@ -221,6 +305,7 @@ + @@ -232,6 +317,7 @@ + @@ -239,6 +325,7 @@ + @@ -247,10 +334,12 @@ + + @@ -263,6 +352,7 @@ + @@ -272,6 +362,7 @@ + @@ -286,6 +377,7 @@ + @@ -407,7 +499,7 @@ - + @@ -463,6 +555,7 @@ + @@ -473,10 +566,12 @@ + + + + + @@ -631,12 +729,14 @@ + + @@ -664,108 +764,106 @@ + + + + + + - - - + + + + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + todir="${mvn.jar.dir}" /> + tofile="${mvn.pom.dir}/hive-anttasks-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-cli-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-common-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-contrib-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-hbase-handler-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-hwi-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-jdbc-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-metastore-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-exec-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-serde-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-service-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-shims-${version}.pom" /> + tofile="${mvn.pom.dir}/hive-pdk-${version}.pom" /> - + - - - + + + - - - + + + - To deploy using maven: - 1) Copy the following to the ~/.m2/settings.xml file please - see:http://maven.apache.org/developers/committer-settings.html - <servers> - <server> - <id>apache.${repo}.https</id> - <username>[username]</username> - <password>[password]</password> - </server> - </servers> - 2)Read - http://www.apache.org/dev/repository-faq.html - http://www.apache.org/dev/publishing-maven-artifacts.html - 3)Run the maven-publish target to publish - the artifact to the ASF Nexus - staging process + Please consult the HowToRelease page on the Hive Wiki for + a description of the remaining steps required to publish + Maven artifacts to the ASF repository: + + https://cwiki.apache.org/confluence/display/Hive/HowToRelease - + + @@ -807,4 +905,132 @@ + + + + + + + + + + + Signing @{input.file} Sig File: @{output.file} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git cli/build.xml cli/build.xml index add53e1..958cfe7 100755 --- cli/build.xml +++ cli/build.xml @@ -28,7 +28,7 @@ to call at top-level: ant deploy-contrib compile-core-test - + - + + diff --git contrib/build.xml contrib/build.xml index cf1711c..14e1e20 100644 --- contrib/build.xml +++ contrib/build.xml @@ -48,6 +48,7 @@ + @@ -55,7 +56,8 @@ - + + diff --git hbase-handler/build.xml hbase-handler/build.xml index 4990b13..f45dbfc 100644 --- hbase-handler/build.xml +++ hbase-handler/build.xml @@ -52,6 +52,7 @@ + @@ -59,7 +60,8 @@ - + + diff --git hwi/build.xml hwi/build.xml index 76bffa8..4919570 100644 --- hwi/build.xml +++ hwi/build.xml @@ -44,6 +44,7 @@ + - + + + - + + diff --git metastore/build.xml metastore/build.xml index 7f01f91..af46bc9 100755 --- metastore/build.xml +++ metastore/build.xml @@ -23,6 +23,7 @@ + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/hive_metastore.thrift @@ -36,6 +37,7 @@ + Building Grammar ${src.dir}/java/org/apache/hadoop/hive/metastore/parser/Filter.g .... @@ -45,11 +47,12 @@ + - + + + @@ -79,6 +84,7 @@ + @@ -96,8 +102,10 @@ + + - + + diff --git odbc/build.xml odbc/build.xml index db9f4af..cddbba4 100644 --- odbc/build.xml +++ odbc/build.xml @@ -41,12 +41,14 @@ + + @@ -60,6 +62,7 @@ + @@ -69,6 +72,7 @@ + @@ -79,6 +83,7 @@ + @@ -88,6 +93,7 @@ + diff --git pdk/build.xml pdk/build.xml index b1f6ed4..65294e6 100644 --- pdk/build.xml +++ pdk/build.xml @@ -28,7 +28,7 @@ - + + diff --git ql/build.xml ql/build.xml index ca8ba86..8b22508 100644 --- ql/build.xml +++ ql/build.xml @@ -55,6 +55,7 @@ + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/queryplan.thrift @@ -62,7 +63,8 @@ - + + @@ -155,6 +157,7 @@ + Building Grammar ${src.dir}/org/apache/hadoop/hive/ql/parse/Hive.g .... @@ -164,11 +167,12 @@ + - + - + @@ -228,7 +232,7 @@ - + diff --git serde/build.xml serde/build.xml index 51ac8dd..471c43d 100644 --- serde/build.xml +++ serde/build.xml @@ -29,7 +29,7 @@ to call at top-level: ant deploy-contrib compile-core-test - + - + + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift to build java serde Constants... @@ -72,6 +73,7 @@ to call at top-level: ant deploy-contrib compile-core-test + Generating data/files/complex.seq... + You must set the 'thrift.home' property! Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/hive_service.thrift @@ -49,6 +50,7 @@ + + - + + diff --git shims/build.xml shims/build.xml index 9dadc8a..3930ca2 100644 --- shims/build.xml +++ shims/build.xml @@ -42,6 +42,7 @@ to call at top-level: ant deploy-contrib compile-core-test + + @@ -81,6 +83,7 @@ to call at top-level: ant deploy-contrib compile-core-test + + +