Update to version 1.2.1.

3 files changed, 55 insertions, 24 deletions

diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index da0cad18db14..b700028aee25 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hive
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/stable \
 		LOCAL/demon/:maven \
diff --git a/devel/hive/distinfo b/devel/hive/distinfo
index bcfdb8e20eae..afefc39be596 100644
--- a/devel/hive/distinfo
+++ b/devel/hive/distinfo
@@ -1,4 +1,4 @@
-SHA256 (hadoop/apache-hive-1.1.0-src.tar.gz) = 340bdd46e305f077132c0b1b0c62a1752245ec6deac7dc87b826e716e2f5c45f
-SIZE (hadoop/apache-hive-1.1.0-src.tar.gz) = 11990526
-SHA256 (hadoop/FreeBSD-hive-1.1.0-maven-repository.tar.gz) = 58e4b1f046ecd3f08949614bd86dbe1b83669a45cac0f9495e057f3497ce3835
-SIZE (hadoop/FreeBSD-hive-1.1.0-maven-repository.tar.gz) = 365563658
+SHA256 (hadoop/apache-hive-1.2.1-src.tar.gz) = 4e302c487717a9fd3a51574eaa03392ab82b20f6998ac6be05783643fa32603c
+SIZE (hadoop/apache-hive-1.2.1-src.tar.gz) = 14320992
+SHA256 (hadoop/FreeBSD-hive-1.2.1-maven-repository.tar.gz) = 19a886ea1d710dc1dd52579f887bd8e90706a869613536603d402582a9e5ab88
+SIZE (hadoop/FreeBSD-hive-1.2.1-maven-repository.tar.gz) = 363991147
diff --git a/devel/hive/pkg-plist b/devel/hive/pkg-plist
index 9b13a71335d1..0e8373086ed4 100644
--- a/devel/hive/pkg-plist
+++ b/devel/hive/pkg-plist
@@ -39,9 +39,11 @@ hive/conf/hive-default.xml.template
 hive/conf/hive-env.sh.template
 hive/conf/hive-exec-log4j.properties.template
 hive/conf/hive-log4j.properties.template
+hive/conf/ivysettings.xml
 hive/examples/files/2000_cols_data.csv
 hive/examples/files/AvroPrimitiveInList.parquet
 hive/examples/files/AvroSingleFieldGroupInList.parquet
+hive/examples/files/HiveGroup.parquet
 hive/examples/files/HiveRequiredGroupInList.parquet
 hive/examples/files/MultiFieldGroupInList.parquet
 hive/examples/files/NestedMap.parquet
@@ -53,6 +55,7 @@ hive/examples/files/SortCol1Col2.txt
 hive/examples/files/SortCol2Col1.txt
 hive/examples/files/SortDescCol1Col2.txt
 hive/examples/files/SortDescCol2Col1.txt
+hive/examples/files/StringMapOfOptionalIntArray.parquet
 hive/examples/files/T1.txt
 hive/examples/files/T2.txt
 hive/examples/files/T3.txt
@@ -102,6 +105,7 @@ hive/examples/files/dim_shops.txt
 hive/examples/files/doctors.avro
 hive/examples/files/docurl.txt
 hive/examples/files/double.txt
+hive/examples/files/dynamic_partition_insert.txt
 hive/examples/files/dynpart_test.txt
 hive/examples/files/emp.txt
 hive/examples/files/employee.dat
@@ -113,6 +117,7 @@ hive/examples/files/episodes.avro
 hive/examples/files/escapetest.txt
 hive/examples/files/extrapolate_stats_full.txt
 hive/examples/files/extrapolate_stats_partial.txt
+hive/examples/files/extrapolate_stats_partial_ndv.txt
 hive/examples/files/fact-data.txt
 hive/examples/files/flights_join.txt
 hive/examples/files/flights_tiny.txt
@@ -170,6 +175,7 @@ hive/examples/files/map_null_schema.avro
 hive/examples/files/map_null_val.avro
 hive/examples/files/map_table.txt
 hive/examples/files/nested_complex.txt
+hive/examples/files/nestedcomplex_additional.txt
 hive/examples/files/non_ascii_tbl.txt
 hive/examples/files/null.txt
 hive/examples/files/nullfile.txt
@@ -181,6 +187,7 @@ hive/examples/files/orc_split_elim.orc
 hive/examples/files/parquet_array_null_element.txt
 hive/examples/files/parquet_columnar.txt
 hive/examples/files/parquet_create.txt
+hive/examples/files/parquet_external_time.parq
 hive/examples/files/parquet_partitioned.txt
 hive/examples/files/parquet_types.txt
 hive/examples/files/part.rc
@@ -207,6 +214,7 @@ hive/examples/files/smbbucket_2.rc
 hive/examples/files/smbbucket_2.txt
 hive/examples/files/smbbucket_3.rc
 hive/examples/files/smbbucket_3.txt
+hive/examples/files/sortdp.txt
 hive/examples/files/sour1.txt
 hive/examples/files/sour2.txt
 hive/examples/files/source.txt
@@ -234,7 +242,11 @@ hive/examples/files/things.txt
 hive/examples/files/things2.txt
 hive/examples/files/tiny_a.txt
 hive/examples/files/tiny_b.txt
+hive/examples/files/tjoin1.txt
+hive/examples/files/tjoin2.txt
 hive/examples/files/truststore.jks
+hive/examples/files/ts_formats.txt
+hive/examples/files/tsformat.json
 hive/examples/files/type_evolution.avro
 hive/examples/files/union_input.txt
 hive/examples/files/v1.txt
@@ -343,9 +355,9 @@ hive/lib/asm-commons-3.1.jar
 hive/lib/asm-tree-3.1.jar
 hive/lib/avro-1.7.5.jar
 hive/lib/bonecp-0.8.0.RELEASE.jar
-hive/lib/calcite-avatica-1.0.0-incubating.jar
-hive/lib/calcite-core-1.0.0-incubating.jar
-hive/lib/calcite-linq4j-1.0.0-incubating.jar
+hive/lib/calcite-avatica-1.2.0-incubating.jar
+hive/lib/calcite-core-1.2.0-incubating.jar
+hive/lib/calcite-linq4j-1.2.0-incubating.jar
 hive/lib/commons-beanutils-1.7.0.jar
 hive/lib/commons-beanutils-core-1.8.0.jar
 hive/lib/commons-cli-1.2.jar
@@ -365,11 +377,12 @@ hive/lib/commons-pool-1.5.4.jar
 hive/lib/commons-vfs2-2.0.jar
 hive/lib/curator-client-2.6.0.jar
 hive/lib/curator-framework-2.6.0.jar
+hive/lib/curator-recipes-2.6.0.jar
 hive/lib/datanucleus-api-jdo-3.2.6.jar
 hive/lib/datanucleus-core-3.2.10.jar
 hive/lib/datanucleus-rdbms-3.2.9.jar
-hive/lib/derby-10.11.1.1.jar
-hive/lib/eigenbase-properties-1.1.4.jar
+hive/lib/derby-10.10.2.0.jar
+hive/lib/eigenbase-properties-1.1.5.jar
 hive/lib/geronimo-annotation_1.0_spec-1.1.1.jar
 hive/lib/geronimo-jaspic_1.0_spec-1.0.jar
 hive/lib/geronimo-jta_1.1_spec-1.1.1.jar
@@ -396,21 +409,24 @@ hive/lib/hive-shims-%%HIVE_VER%%.jar
 hive/lib/hive-shims-common-%%HIVE_VER%%.jar
 hive/lib/hive-shims-scheduler-%%HIVE_VER%%.jar
 hive/lib/hive-testutils-%%HIVE_VER%%.jar
-hive/lib/httpclient-4.2.5.jar
-hive/lib/httpcore-4.2.5.jar
+hive/lib/httpclient-4.4.jar
+hive/lib/httpcore-4.4.jar
+hive/lib/ivy-2.4.0.jar
 hive/lib/janino-2.7.6.jar
 hive/lib/jcommander-1.32.jar
 hive/lib/jdo-api-3.0.1.jar
 hive/lib/jetty-all-7.6.0.v20120127.jar
 hive/lib/jetty-all-server-7.6.0.v20120127.jar
 hive/lib/jline-2.12.jar
+hive/lib/joda-time-2.5.jar
 hive/lib/jpam-1.1.jar
+hive/lib/json-20090211.jar
 hive/lib/jsr305-3.0.0.jar
 hive/lib/jta-1.1.jar
 hive/lib/junit-4.11.jar
 hive/lib/libfb303-0.9.2.jar
 hive/lib/libthrift-0.9.2.jar
-hive/lib/log4j-1.2.16.jar
+hive/lib/log4j-%%HIVE_VER%%6.jar
 hive/lib/mail-1.4.1.jar
 hive/lib/maven-scm-api-1.4.jar
 hive/lib/maven-scm-provider-svn-commons-1.4.jar
@@ -419,7 +435,7 @@ hive/lib/netty-3.7.0.Final.jar
 hive/lib/opencsv-2.3.jar
 hive/lib/oro-2.0.8.jar
 hive/lib/paranamer-2.3.jar
-hive/lib/parquet-hadoop-bundle-1.6.0rc3.jar
+hive/lib/parquet-hadoop-bundle-1.6.0.jar
 hive/lib/pentaho-aggdesigner-algorithm-5.1.5-jhyde.jar
 hive/lib/php/Thrift.php
 hive/lib/php/autoload.php
@@ -544,36 +560,45 @@ hive/scripts/metastore/upgrade/derby/hive-schema-0.6.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-schema-0.7.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-schema-0.8.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-schema-0.9.0.derby.sql
-hive/scripts/metastore/upgrade/derby/hive-schema-%%HIVE_VER%%.derby.sql
+hive/scripts/metastore/upgrade/derby/hive-schema-1.1.0.derby.sql
+hive/scripts/metastore/upgrade/derby/hive-schema-1.2.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-txn-schema-0.13.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-txn-schema-0.14.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.10.0-to-0.11.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.11.0-to-0.12.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.12.0-to-0.13.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.13.0-to-0.14.0.derby.sql
-hive/scripts/metastore/upgrade/derby/upgrade-0.14.0-to-%%HIVE_VER%%.derby.sql
+hive/scripts/metastore/upgrade/derby/upgrade-0.14.0-to-1.1.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.5.0-to-0.6.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.6.0-to-0.7.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.7.0-to-0.8.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.8.0-to-0.9.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade-0.9.0-to-0.10.0.derby.sql
+hive/scripts/metastore/upgrade/derby/upgrade-1.1.0-to-1.2.0.derby.sql
 hive/scripts/metastore/upgrade/derby/upgrade.order.derby
 hive/scripts/metastore/upgrade/mssql/001-HIVE-6862.mssql.sql
 hive/scripts/metastore/upgrade/mssql/002-HIVE-7784.mssql.sql
 hive/scripts/metastore/upgrade/mssql/003-HIVE-8239.mssql.sql
 hive/scripts/metastore/upgrade/mssql/004-HIVE-8550.mssql.sql
 hive/scripts/metastore/upgrade/mssql/005-HIVE-9296.mssql.sql
+hive/scripts/metastore/upgrade/mssql/006-HIVE-9456.mssql.sql
 hive/scripts/metastore/upgrade/mssql/README
 hive/scripts/metastore/upgrade/mssql/hive-schema-0.11.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/hive-schema-0.12.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/hive-schema-0.13.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/hive-schema-0.14.0.mssql.sql
-hive/scripts/metastore/upgrade/mssql/hive-schema-%%HIVE_VER%%.mssql.sql
+hive/scripts/metastore/upgrade/mssql/hive-schema-1.1.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/hive-schema-1.2.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/hive-txn-schema-0.13.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/pre-0-upgrade-0.12.0-to-0.13.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/pre-0-upgrade-0.13.0-to-0.14.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/pre-1-upgrade-0.12.0-to-0.13.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/pre-1-upgrade-0.13.0-to-0.14.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/upgrade-0.12.0-to-0.13.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/upgrade-0.13.0-to-0.14.0.mssql.sql
-hive/scripts/metastore/upgrade/mssql/upgrade-0.14.0-to-%%HIVE_VER%%.mssql.sql
+hive/scripts/metastore/upgrade/mssql/upgrade-0.14.0-to-1.1.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/upgrade-1.1.0-to-1.2.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/upgrade.order.mssql
 hive/scripts/metastore/upgrade/mysql/001-HIVE-972.mysql.sql
 hive/scripts/metastore/upgrade/mysql/002-HIVE-1068.mysql.sql
@@ -608,19 +633,21 @@ hive/scripts/metastore/upgrade/mysql/hive-schema-0.6.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-schema-0.7.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-schema-0.8.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-schema-0.9.0.mysql.sql
-hive/scripts/metastore/upgrade/mysql/hive-schema-%%HIVE_VER%%.mysql.sql
+hive/scripts/metastore/upgrade/mysql/hive-schema-1.1.0.mysql.sql
+hive/scripts/metastore/upgrade/mysql/hive-schema-1.2.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-txn-schema-0.13.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-txn-schema-0.14.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.10.0-to-0.11.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.11.0-to-0.12.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.12.0-to-0.13.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.13.0-to-0.14.0.mysql.sql
-hive/scripts/metastore/upgrade/mysql/upgrade-0.14.0-to-%%HIVE_VER%%.mysql.sql
+hive/scripts/metastore/upgrade/mysql/upgrade-0.14.0-to-1.1.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.5.0-to-0.6.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.6.0-to-0.7.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.7.0-to-0.8.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.8.0-to-0.9.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade-0.9.0-to-0.10.0.mysql.sql
+hive/scripts/metastore/upgrade/mysql/upgrade-1.1.0-to-1.2.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/upgrade.order.mysql
 hive/scripts/metastore/upgrade/oracle/010-HIVE-3072.oracle.sql
 hive/scripts/metastore/upgrade/oracle/011-HIVE-3649.oracle.sql
@@ -639,7 +666,8 @@ hive/scripts/metastore/upgrade/oracle/hive-schema-0.12.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-0.13.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-0.14.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-0.9.0.oracle.sql
-hive/scripts/metastore/upgrade/oracle/hive-schema-%%HIVE_VER%%.oracle.sql
+hive/scripts/metastore/upgrade/oracle/hive-schema-1.1.0.oracle.sql
+hive/scripts/metastore/upgrade/oracle/hive-schema-1.2.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-txn-schema-0.13.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-txn-schema-0.14.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/pre-0-upgrade-0.13.0-to-0.14.0.oracle.sql
@@ -648,8 +676,9 @@ hive/scripts/metastore/upgrade/oracle/upgrade-0.10.0-to-0.11.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/upgrade-0.11.0-to-0.12.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/upgrade-0.12.0-to-0.13.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/upgrade-0.13.0-to-0.14.0.oracle.sql
-hive/scripts/metastore/upgrade/oracle/upgrade-0.14.0-to-%%HIVE_VER%%.oracle.sql
+hive/scripts/metastore/upgrade/oracle/upgrade-0.14.0-to-1.1.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/upgrade-0.9.0-to-0.10.0.oracle.sql
+hive/scripts/metastore/upgrade/oracle/upgrade-1.1.0-to-1.2.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/upgrade.order.oracle
 hive/scripts/metastore/upgrade/postgres/001-HIVE-972.postgres.sql
 hive/scripts/metastore/upgrade/postgres/002-HIVE-1068.postgres.sql
@@ -685,7 +714,8 @@ hive/scripts/metastore/upgrade/postgres/hive-schema-0.6.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-schema-0.7.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-schema-0.8.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-schema-0.9.0.postgres.sql
-hive/scripts/metastore/upgrade/postgres/hive-schema-%%HIVE_VER%%.postgres.sql
+hive/scripts/metastore/upgrade/postgres/hive-schema-1.1.0.postgres.sql
+hive/scripts/metastore/upgrade/postgres/hive-schema-1.2.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-txn-schema-0.13.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-txn-schema-0.14.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/pre-0-upgrade-0.12.0-to-0.13.0.postgres.sql
@@ -694,12 +724,13 @@ hive/scripts/metastore/upgrade/postgres/upgrade-0.10.0-to-0.11.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.11.0-to-0.12.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.12.0-to-0.13.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.13.0-to-0.14.0.postgres.sql
-hive/scripts/metastore/upgrade/postgres/upgrade-0.14.0-to-%%HIVE_VER%%.postgres.sql
+hive/scripts/metastore/upgrade/postgres/upgrade-0.14.0-to-1.1.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.5.0-to-0.6.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.6.0-to-0.7.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.7.0-to-0.8.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.8.0-to-0.9.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.9.0-to-0.10.0.postgres.sql
+hive/scripts/metastore/upgrade/postgres/upgrade-1.1.0-to-1.2.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade.order.postgres
 @dir(%%HIVE_USER%%,%%HIVE_GROUP%%,) %%HIVE_LOGDIR%%
 @dir(%%HIVE_USER%%,%%HIVE_GROUP%%,) %%HIVE_RUNDIR%%