3 files changed, 215 insertions, 54 deletions

diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index b700028aee25..8440e25483ef 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	hive
-PORTVERSION=	1.2.1
+PORTVERSION=	2.0.0
 CATEGORIES=	devel java
-MASTER_SITES=	APACHE/${PORTNAME}/stable \
+MASTER_SITES=	APACHE/${PORTNAME}/stable-2 \
 		LOCAL/demon/:maven \
 		http://people.freebsd.org/~demon/:maven
 DISTFILES=	apache-${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
@@ -49,6 +49,9 @@ HIVE_DIST=	${WRKSRC}/packaging/target/apache-hive-${PORTVERSION}-bin/apache-hive
 post-patch:
 		${REINPLACE_CMD} -e s#%%PREFIX%%#${PREFIX}# -e s#%%LOCALBASE%%#${LOCALBASE}# ${WRKSRC}/conf/hive-env.sh.template
 
+pre-build:
+	${RM} ${WRKSRC}/bin/*.cmd ${WRKSRC}/bin/ext/*.cmd
+
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean install -Phadoop-2,dist -DskipTests
 
diff --git a/devel/hive/distinfo b/devel/hive/distinfo
index afefc39be596..1fb6c5f76e08 100644
--- a/devel/hive/distinfo
+++ b/devel/hive/distinfo
@@ -1,4 +1,4 @@
-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
+SHA256 (hadoop/apache-hive-2.0.0-src.tar.gz) = dd2b2baf1e3fec9cdcc971e254e0275f9d572a846f4bcad53246eff32fcc29d6
+SIZE (hadoop/apache-hive-2.0.0-src.tar.gz) = 15779309
+SHA256 (hadoop/FreeBSD-hive-2.0.0-maven-repository.tar.gz) = 295040a7c1b14dbdbe5890d34244a971ab6fc810c0aabe6ce8bfa614dc8744ed
+SIZE (hadoop/FreeBSD-hive-2.0.0-maven-repository.tar.gz) = 445041603
diff --git a/devel/hive/pkg-plist b/devel/hive/pkg-plist
index 0e8373086ed4..e9f81596b68b 100644
--- a/devel/hive/pkg-plist
+++ b/devel/hive/pkg-plist
@@ -1,30 +1,22 @@
 hive/bin/beeline
 hive/bin/ext/beeline.sh
-hive/bin/ext/cli.cmd
 hive/bin/ext/cli.sh
-hive/bin/ext/debug.cmd
 hive/bin/ext/debug.sh
-hive/bin/ext/help.cmd
+hive/bin/ext/hbaseimport.sh
+hive/bin/ext/hbaseschematool.sh
 hive/bin/ext/help.sh
 hive/bin/ext/hiveburninclient.sh
-hive/bin/ext/hiveserver.cmd
 hive/bin/ext/hiveserver.sh
-hive/bin/ext/hiveserver2.cmd
 hive/bin/ext/hiveserver2.sh
-hive/bin/ext/hwi.cmd
+hive/bin/ext/hplsql.sh
 hive/bin/ext/hwi.sh
-hive/bin/ext/jar.cmd
 hive/bin/ext/jar.sh
-hive/bin/ext/lineage.cmd
 hive/bin/ext/lineage.sh
-hive/bin/ext/metastore.cmd
+hive/bin/ext/llap.sh
 hive/bin/ext/metastore.sh
 hive/bin/ext/metatool.sh
-hive/bin/ext/orcfiledump.cmd
 hive/bin/ext/orcfiledump.sh
-hive/bin/ext/rcfilecat.cmd
 hive/bin/ext/rcfilecat.sh
-hive/bin/ext/schemaTool.cmd
 hive/bin/ext/schemaTool.sh
 hive/bin/ext/util/execHiveCmd.cmd
 hive/bin/ext/util/execHiveCmd.sh
@@ -32,14 +24,16 @@ hive/bin/ext/version.sh
 hive/bin/hive
 hive/bin/hive-config.sh
 hive/bin/hiveserver2
+hive/bin/hplsql
 hive/bin/metatool
 hive/bin/schematool
-hive/conf/beeline-log4j.properties.template
+hive/conf/beeline-log4j2.properties.template
 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/hive-exec-log4j2.properties.template
+hive/conf/hive-log4j2.properties.template
 hive/conf/ivysettings.xml
+hive/conf/llap-daemon-log4j2.properties.template
 hive/examples/files/2000_cols_data.csv
 hive/examples/files/AvroPrimitiveInList.parquet
 hive/examples/files/AvroSingleFieldGroupInList.parquet
@@ -90,7 +84,9 @@ hive/examples/files/complex.seq
 hive/examples/files/covar_tab.txt
 hive/examples/files/create_nested_type.txt
 hive/examples/files/csv.txt
+hive/examples/files/ct_events_clean.txt
 hive/examples/files/customer_address.txt
+hive/examples/files/customers.txt
 hive/examples/files/data_with_escape.txt
 hive/examples/files/datatypes.txt
 hive/examples/files/dec.avro
@@ -99,6 +95,7 @@ hive/examples/files/dec.txt
 hive/examples/files/dec_comp.txt
 hive/examples/files/decimal.txt
 hive/examples/files/decimal_10_0.txt
+hive/examples/files/decimal_1_1.txt
 hive/examples/files/dept.txt
 hive/examples/files/dim-data.txt
 hive/examples/files/dim_shops.txt
@@ -107,13 +104,19 @@ 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/dynpartdata1.txt
+hive/examples/files/dynpartdata2.txt
 hive/examples/files/emp.txt
+hive/examples/files/emp2.txt
 hive/examples/files/employee.dat
 hive/examples/files/employee2.dat
 hive/examples/files/employee_part.txt
 hive/examples/files/empty1.txt
 hive/examples/files/empty2.txt
+hive/examples/files/encoding-utf8.txt
+hive/examples/files/encoding_iso-8859-1.txt
 hive/examples/files/episodes.avro
+hive/examples/files/escape_crlf.txt
 hive/examples/files/escapetest.txt
 hive/examples/files/extrapolate_stats_full.txt
 hive/examples/files/extrapolate_stats_partial.txt
@@ -171,10 +174,12 @@ hive/examples/files/location.txt
 hive/examples/files/lt100.sorted.txt
 hive/examples/files/lt100.txt
 hive/examples/files/lt100.txt.deflate
+hive/examples/files/mapNull.txt
 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/nested_orders.txt
 hive/examples/files/nestedcomplex_additional.txt
 hive/examples/files/non_ascii_tbl.txt
 hive/examples/files/null.txt
@@ -184,11 +189,13 @@ hive/examples/files/opencsv-data.txt
 hive/examples/files/orc_create.txt
 hive/examples/files/orc_create_people.txt
 hive/examples/files/orc_split_elim.orc
+hive/examples/files/orders.txt
 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_type_promotion.txt
 hive/examples/files/parquet_types.txt
 hive/examples/files/part.rc
 hive/examples/files/part.seq
@@ -202,6 +209,8 @@ hive/examples/files/sales.txt
 hive/examples/files/sample-queryplan-in-history.txt
 hive/examples/files/sample-queryplan.txt
 hive/examples/files/sample.json
+hive/examples/files/sample2.json
+hive/examples/files/service_request_clean.txt
 hive/examples/files/smallsrcsortbucket1outof4.txt
 hive/examples/files/smallsrcsortbucket2outof4.txt
 hive/examples/files/smallsrcsortbucket3outof4.txt
@@ -307,7 +316,7 @@ hive/hcatalog/bin/templeton.cmd
 hive/hcatalog/etc/hcatalog/jndi.properties
 hive/hcatalog/etc/hcatalog/proto-hive-site.xml
 hive/hcatalog/etc/webhcat/webhcat-default.xml
-hive/hcatalog/etc/webhcat/webhcat-log4j.properties
+hive/hcatalog/etc/webhcat/webhcat-log4j2.properties
 hive/hcatalog/libexec/hcat-config.sh
 hive/hcatalog/sbin/hcat_server.py
 hive/hcatalog/sbin/hcat_server.sh
@@ -321,74 +330,85 @@ hive/hcatalog/share/hcatalog/hive-hcatalog-pig-adapter-%%HIVE_VER%%.jar
 hive/hcatalog/share/hcatalog/hive-hcatalog-server-extensions-%%HIVE_VER%%.jar
 hive/hcatalog/share/hcatalog/hive-hcatalog-streaming-%%HIVE_VER%%.jar
 hive/hcatalog/share/webhcat/java-client/hive-webhcat-java-client-%%HIVE_VER%%.jar
-hive/hcatalog/share/webhcat/svr/lib/asm-3.1.jar
 hive/hcatalog/share/webhcat/svr/lib/commons-exec-1.1.jar
 hive/hcatalog/share/webhcat/svr/lib/hive-webhcat-%%HIVE_VER%%.jar
 hive/hcatalog/share/webhcat/svr/lib/jackson-core-asl-1.9.2.jar
-hive/hcatalog/share/webhcat/svr/lib/jackson-jaxrs-1.9.2.jar
 hive/hcatalog/share/webhcat/svr/lib/jackson-xc-1.9.2.jar
-hive/hcatalog/share/webhcat/svr/lib/jaxb-api-2.2.2.jar
 hive/hcatalog/share/webhcat/svr/lib/jaxb-impl-2.2.3-1.jar
 hive/hcatalog/share/webhcat/svr/lib/jersey-core-1.14.jar
 hive/hcatalog/share/webhcat/svr/lib/jersey-json-1.14.jar
-hive/hcatalog/share/webhcat/svr/lib/jersey-server-1.14.jar
 hive/hcatalog/share/webhcat/svr/lib/jersey-servlet-1.14.jar
 hive/hcatalog/share/webhcat/svr/lib/jettison-1.1.jar
 hive/hcatalog/share/webhcat/svr/lib/jul-to-slf4j-1.7.5.jar
-hive/hcatalog/share/webhcat/svr/lib/stax-api-1.0-2.jar
 hive/hcatalog/share/webhcat/svr/lib/wadl-resourcedoc-doclet-1.4.jar
-hive/hcatalog/share/webhcat/svr/lib/xercesImpl-2.9.1.jar
-hive/hcatalog/share/webhcat/svr/lib/xml-apis-1.3.04.jar
 hive/lib/ST4-4.0.4.jar
 hive/lib/accumulo-core-1.6.0.jar
 hive/lib/accumulo-fate-1.6.0.jar
 hive/lib/accumulo-start-1.6.0.jar
 hive/lib/accumulo-trace-1.6.0.jar
 hive/lib/activation-1.1.jar
+hive/lib/ant-1.6.5.jar
 hive/lib/ant-1.9.1.jar
 hive/lib/ant-launcher-1.9.1.jar
 hive/lib/antlr-2.7.7.jar
 hive/lib/antlr-runtime-3.4.jar
+hive/lib/antlr4-runtime-4.5.jar
+hive/lib/aopalliance-1.0.jar
 hive/lib/apache-curator-2.6.0.pom
-hive/lib/apache-log4j-extras-1.2.17.jar
+hive/lib/asm-3.1.jar
 hive/lib/asm-commons-3.1.jar
 hive/lib/asm-tree-3.1.jar
-hive/lib/avro-1.7.5.jar
+hive/lib/avro-1.7.7.jar
 hive/lib/bonecp-0.8.0.RELEASE.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/calcite-avatica-1.5.0.jar
+hive/lib/calcite-core-1.5.0.jar
+hive/lib/calcite-linq4j-1.5.0.jar
 hive/lib/commons-cli-1.2.jar
 hive/lib/commons-codec-1.4.jar
-hive/lib/commons-collections-3.2.1.jar
+hive/lib/commons-collections-3.2.2.jar
 hive/lib/commons-compiler-2.7.6.jar
-hive/lib/commons-compress-1.4.1.jar
-hive/lib/commons-configuration-1.6.jar
+hive/lib/commons-compress-1.9.jar
 hive/lib/commons-dbcp-1.4.jar
-hive/lib/commons-digester-1.8.jar
+hive/lib/commons-el-1.0.jar
 hive/lib/commons-httpclient-3.0.1.jar
 hive/lib/commons-io-2.4.jar
 hive/lib/commons-lang-2.6.jar
-hive/lib/commons-logging-1.1.3.jar
-hive/lib/commons-math-2.1.jar
+hive/lib/commons-lang3-3.1.jar
+hive/lib/commons-logging-1.2.jar
+hive/lib/commons-math-2.2.jar
 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/datanucleus-api-jdo-4.2.1.jar
+hive/lib/datanucleus-core-4.1.6.jar
+hive/lib/datanucleus-rdbms-4.1.7.jar
 hive/lib/derby-10.10.2.0.jar
+hive/lib/disruptor-3.3.0.jar
 hive/lib/eigenbase-properties-1.1.5.jar
+hive/lib/fastutil-6.5.6.jar
+hive/lib/findbugs-annotations-1.3.9-1.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
-hive/lib/groovy-all-2.1.6.jar
+hive/lib/groovy-all-2.4.4.jar
+hive/lib/gson-2.2.4.jar
 hive/lib/guava-14.0.1.jar
+hive/lib/guice-3.0.jar
+hive/lib/guice-assistedinject-3.0.jar
 hive/lib/hamcrest-core-1.1.jar
+hive/lib/hbase-annotations-1.1.1.jar
+hive/lib/hbase-client-1.1.1.jar
+hive/lib/hbase-common-1.1.1-tests.jar
+hive/lib/hbase-common-1.1.1.jar
+hive/lib/hbase-hadoop-compat-1.1.1.jar
+hive/lib/hbase-hadoop2-compat-1.1.1-tests.jar
+hive/lib/hbase-hadoop2-compat-1.1.1.jar
+hive/lib/hbase-prefix-tree-1.1.1.jar
+hive/lib/hbase-procedure-1.1.1.jar
+hive/lib/hbase-protocol-1.1.1.jar
+hive/lib/hbase-server-1.1.1.jar
 hive/lib/hive-accumulo-handler-%%HIVE_VER%%.jar
 hive/lib/hive-ant-%%HIVE_VER%%.jar
 hive/lib/hive-beeline-%%HIVE_VER%%.jar
@@ -397,45 +417,80 @@ hive/lib/hive-common-%%HIVE_VER%%.jar
 hive/lib/hive-contrib-%%HIVE_VER%%.jar
 hive/lib/hive-exec-%%HIVE_VER%%.jar
 hive/lib/hive-hbase-handler-%%HIVE_VER%%.jar
+hive/lib/hive-hplsql-%%HIVE_VER%%.jar
 hive/lib/hive-hwi-%%HIVE_VER%%.jar
 hive/lib/hive-jdbc-%%HIVE_VER%%-standalone.jar
 hive/lib/hive-jdbc-%%HIVE_VER%%.jar
+hive/lib/hive-llap-client-%%HIVE_VER%%.jar
+hive/lib/hive-llap-common-%%HIVE_VER%%.jar
+hive/lib/hive-llap-server-%%HIVE_VER%%.jar
+hive/lib/hive-llap-tez-%%HIVE_VER%%.jar
 hive/lib/hive-metastore-%%HIVE_VER%%.jar
+hive/lib/hive-orc-%%HIVE_VER%%.jar
 hive/lib/hive-serde-%%HIVE_VER%%.jar
 hive/lib/hive-service-%%HIVE_VER%%.jar
-hive/lib/hive-shims-0.20S-%%HIVE_VER%%.jar
 hive/lib/hive-shims-0.23-%%HIVE_VER%%.jar
 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-storage-api-%%HIVE_VER%%.jar
 hive/lib/hive-testutils-%%HIVE_VER%%.jar
+hive/lib/htrace-core-3.1.0-incubating.jar
 hive/lib/httpclient-4.4.jar
 hive/lib/httpcore-4.4.jar
 hive/lib/ivy-2.4.0.jar
+hive/lib/jackson-annotations-2.4.0.jar
+hive/lib/jackson-core-2.4.2.jar
+hive/lib/jackson-databind-2.4.2.jar
+hive/lib/jackson-jaxrs-1.9.2.jar
+hive/lib/jamon-runtime-2.3.1.jar
 hive/lib/janino-2.7.6.jar
+hive/lib/jasper-compiler-5.5.23.jar
+hive/lib/jasper-runtime-5.5.23.jar
+hive/lib/javax.inject-1.jar
+hive/lib/javax.jdo-3.2.0-m3.jar
+hive/lib/javax.servlet-3.0.0.v201112011016.jar
+hive/lib/jcodings-1.0.8.jar
 hive/lib/jcommander-1.32.jar
 hive/lib/jdo-api-3.0.1.jar
+hive/lib/jersey-server-1.14.jar
+hive/lib/jetty-6.1.26.jar
 hive/lib/jetty-all-7.6.0.v20120127.jar
 hive/lib/jetty-all-server-7.6.0.v20120127.jar
+hive/lib/jetty-sslengine-6.1.26.jar
+hive/lib/jetty-util-6.1.26.jar
 hive/lib/jline-2.12.jar
 hive/lib/joda-time-2.5.jar
+hive/lib/joni-2.1.2.jar
 hive/lib/jpam-1.1.jar
 hive/lib/json-20090211.jar
+hive/lib/jsp-2.1-6.1.14.jar
+hive/lib/jsp-api-2.0.jar
+hive/lib/jsp-api-2.1-6.1.14.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-%%HIVE_VER%%6.jar
+hive/lib/libfb303-0.9.3.jar
+hive/lib/libthrift-0.9.3.jar
+hive/lib/log4j-1.2-api-2.4.1.jar
+hive/lib/log4j-api-2.4.1.jar
+hive/lib/log4j-core-2.4.1.jar
+hive/lib/log4j-slf4j-impl-2.4.1.jar
+hive/lib/log4j-web-2.4.1.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
 hive/lib/maven-scm-provider-svnexe-1.4.jar
+hive/lib/metrics-core-2.2.0.jar
+hive/lib/metrics-core-3.1.0.jar
+hive/lib/metrics-json-3.1.0.jar
+hive/lib/metrics-jvm-3.1.0.jar
 hive/lib/netty-3.7.0.Final.jar
+hive/lib/netty-all-4.0.23.Final.jar
 hive/lib/opencsv-2.3.jar
-hive/lib/oro-2.0.8.jar
+hive/lib/org.abego.treelayout.core-1.0.1.jar
 hive/lib/paranamer-2.3.jar
-hive/lib/parquet-hadoop-bundle-1.6.0.jar
+hive/lib/parquet-hadoop-bundle-1.8.1.jar
 hive/lib/pentaho-aggdesigner-algorithm-5.1.5-jhyde.jar
 hive/lib/php/Thrift.php
 hive/lib/php/autoload.php
@@ -467,6 +522,7 @@ hive/lib/php/transport/TSocket.php
 hive/lib/php/transport/TSocketPool.php
 hive/lib/php/transport/TTransport.php
 hive/lib/plexus-utils-1.5.6.jar
+hive/lib/protobuf-java-2.5.0.jar
 hive/lib/py/TCLIService/TCLIService-remote
 hive/lib/py/TCLIService/TCLIService.py
 hive/lib/py/TCLIService/__init__.py
@@ -517,15 +573,33 @@ hive/lib/py/thrift/transport/TTransport.py
 hive/lib/py/thrift/transport/TTwisted.py
 hive/lib/py/thrift/transport/__init__.py
 hive/lib/regexp-1.3.jar
-hive/lib/servlet-api-2.5.jar
+hive/lib/servlet-api-2.4.jar
+hive/lib/servlet-api-2.5-6.1.14.jar
+hive/lib/snappy-0.2.jar
 hive/lib/snappy-java-1.0.5.jar
 hive/lib/stax-api-1.0.1.jar
 hive/lib/stringtemplate-3.2.1.jar
 hive/lib/super-csv-2.2.0.jar
 hive/lib/tempus-fugit-1.1.jar
+hive/lib/tephra-api-0.6.0.jar
+hive/lib/tephra-core-0.6.0.jar
+hive/lib/tephra-hbase-compat-1.0-0.6.0.jar
+hive/lib/transaction-api-1.1.jar
+hive/lib/twill-api-0.6.0-incubating.jar
+hive/lib/twill-common-0.6.0-incubating.jar
+hive/lib/twill-core-0.6.0-incubating.jar
+hive/lib/twill-discovery-api-0.6.0-incubating.jar
+hive/lib/twill-discovery-core-0.6.0-incubating.jar
+hive/lib/twill-zookeeper-0.6.0-incubating.jar
 hive/lib/velocity-1.5.jar
-hive/lib/xz-1.0.jar
 hive/lib/zookeeper-3.4.6.jar
+hive/scripts/llap/bin/llap-daemon-env.sh
+hive/scripts/llap/bin/llapDaemon.sh
+hive/scripts/llap/bin/runLlapDaemon.sh
+hive/scripts/llap/slider/llap.py
+hive/scripts/llap/slider/package.py
+hive/scripts/llap/slider/params.py
+hive/scripts/llap/slider/templates.py
 hive/scripts/metastore/upgrade/derby/001-HIVE-972.derby.sql
 hive/scripts/metastore/upgrade/derby/002-HIVE-1068.derby.sql
 hive/scripts/metastore/upgrade/derby/003-HIVE-675.derby.sql
@@ -546,6 +620,17 @@ hive/scripts/metastore/upgrade/derby/017-HIVE-6458.derby.sql
 hive/scripts/metastore/upgrade/derby/018-HIVE-6757.derby.sql
 hive/scripts/metastore/upgrade/derby/019-HIVE-7784.derby.sql
 hive/scripts/metastore/upgrade/derby/020-HIVE-9296.derby.sql
+hive/scripts/metastore/upgrade/derby/021-HIVE-11970.derby.sql
+hive/scripts/metastore/upgrade/derby/023-HIVE-12807.derby.sql
+hive/scripts/metastore/upgrade/derby/024-HIVE-12814.derby.sql
+hive/scripts/metastore/upgrade/derby/025-HIVE-12816.derby.sql
+hive/scripts/metastore/upgrade/derby/026-HIVE-12818.derby.sql
+hive/scripts/metastore/upgrade/derby/027-HIVE-12819.derby.sql
+hive/scripts/metastore/upgrade/derby/028-HIVE-12821.derby.sql
+hive/scripts/metastore/upgrade/derby/029-HIVE-12822.derby.sql
+hive/scripts/metastore/upgrade/derby/030-HIVE-12823.derby.sql
+hive/scripts/metastore/upgrade/derby/031-HIVE-12831.derby.sql
+hive/scripts/metastore/upgrade/derby/032-HIVE-12832.derby.sql
 hive/scripts/metastore/upgrade/derby/README
 hive/scripts/metastore/upgrade/derby/hive-schema-0.10.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-schema-0.11.0.derby.sql
@@ -562,8 +647,12 @@ 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-1.1.0.derby.sql
 hive/scripts/metastore/upgrade/derby/hive-schema-1.2.0.derby.sql
+hive/scripts/metastore/upgrade/derby/hive-schema-1.3.0.derby.sql
+hive/scripts/metastore/upgrade/derby/hive-schema-%%HIVE_VER%%.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/hive-txn-schema-1.3.0.derby.sql
+hive/scripts/metastore/upgrade/derby/hive-txn-schema-%%HIVE_VER%%.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
@@ -575,6 +664,8 @@ 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-1.2.0-to-1.3.0.derby.sql
+hive/scripts/metastore/upgrade/derby/upgrade-1.2.0-to-%%HIVE_VER%%.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
@@ -582,6 +673,17 @@ 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/007-HIVE-11970.mssql.sql
+hive/scripts/metastore/upgrade/mssql/008-HIVE-12807.mssql.sql
+hive/scripts/metastore/upgrade/mssql/009-HIVE-12814.mssql.sql
+hive/scripts/metastore/upgrade/mssql/010-HIVE-12816.mssql.sql
+hive/scripts/metastore/upgrade/mssql/011-HIVE-12818.mssql.sql
+hive/scripts/metastore/upgrade/mssql/012-HIVE-12819.mssql.sql
+hive/scripts/metastore/upgrade/mssql/013-HIVE-12821.mssql.sql
+hive/scripts/metastore/upgrade/mssql/014-HIVE-12822.mssql.sql
+hive/scripts/metastore/upgrade/mssql/015-HIVE-12823.mssql.sql
+hive/scripts/metastore/upgrade/mssql/016-HIVE-12831.mssql.sql
+hive/scripts/metastore/upgrade/mssql/017-HIVE-12832.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
@@ -589,6 +691,8 @@ 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-1.1.0.mssql.sql
 hive/scripts/metastore/upgrade/mssql/hive-schema-1.2.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/hive-schema-1.3.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/hive-schema-%%HIVE_VER%%.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
@@ -599,6 +703,8 @@ 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-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-1.2.0-to-1.3.0.mssql.sql
+hive/scripts/metastore/upgrade/mssql/upgrade-1.2.0-to-%%HIVE_VER%%.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
@@ -619,6 +725,18 @@ hive/scripts/metastore/upgrade/mysql/017-HIVE-6458.mysql.sql
 hive/scripts/metastore/upgrade/mysql/018-HIVE-6757.mysql.sql
 hive/scripts/metastore/upgrade/mysql/019-HIVE-7784.mysql.sql
 hive/scripts/metastore/upgrade/mysql/020-HIVE-9296.mysql.sql
+hive/scripts/metastore/upgrade/mysql/021-HIVE-7018.mysql.sql
+hive/scripts/metastore/upgrade/mysql/022-HIVE-11970.mysql.sql
+hive/scripts/metastore/upgrade/mysql/023-HIVE-12807.mysql.sql
+hive/scripts/metastore/upgrade/mysql/024-HIVE-12814.mysql.sql
+hive/scripts/metastore/upgrade/mysql/025-HIVE-12816.mysql.sql
+hive/scripts/metastore/upgrade/mysql/026-HIVE-12818.mysql.sql
+hive/scripts/metastore/upgrade/mysql/027-HIVE-12819.mysql.sql
+hive/scripts/metastore/upgrade/mysql/028-HIVE-12821.mysql.sql
+hive/scripts/metastore/upgrade/mysql/029-HIVE-12822.mysql.sql
+hive/scripts/metastore/upgrade/mysql/030-HIVE-12823.mysql.sql
+hive/scripts/metastore/upgrade/mysql/031-HIVE-12831.mysql.sql
+hive/scripts/metastore/upgrade/mysql/032-HIVE-12832.mysql.sql
 hive/scripts/metastore/upgrade/mysql/README
 hive/scripts/metastore/upgrade/mysql/hive-schema-0.10.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-schema-0.11.0.mysql.sql
@@ -635,8 +753,12 @@ 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-1.1.0.mysql.sql
 hive/scripts/metastore/upgrade/mysql/hive-schema-1.2.0.mysql.sql
+hive/scripts/metastore/upgrade/mysql/hive-schema-1.3.0.mysql.sql
+hive/scripts/metastore/upgrade/mysql/hive-schema-%%HIVE_VER%%.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/hive-txn-schema-1.3.0.mysql.sql
+hive/scripts/metastore/upgrade/mysql/hive-txn-schema-%%HIVE_VER%%.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
@@ -648,6 +770,8 @@ 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-1.2.0-to-1.3.0.mysql.sql
+hive/scripts/metastore/upgrade/mysql/upgrade-1.2.0-to-%%HIVE_VER%%.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
@@ -660,6 +784,17 @@ hive/scripts/metastore/upgrade/oracle/018-HIVE-6757.oracle.sql
 hive/scripts/metastore/upgrade/oracle/019-HIVE-7118.oracle.sql
 hive/scripts/metastore/upgrade/oracle/020-HIVE-7784.oracle.sql
 hive/scripts/metastore/upgrade/oracle/021-HIVE-9296.oracle.sql
+hive/scripts/metastore/upgrade/oracle/022-HIVE-11970.oracle.sql
+hive/scripts/metastore/upgrade/oracle/023-HIVE-12807.oracle.sql
+hive/scripts/metastore/upgrade/oracle/024-HIVE-12814.oracle.sql
+hive/scripts/metastore/upgrade/oracle/025-HIVE-12816.oracle.sql
+hive/scripts/metastore/upgrade/oracle/026-HIVE-12818.oracle.sql
+hive/scripts/metastore/upgrade/oracle/027-HIVE-12819.oracle.sql
+hive/scripts/metastore/upgrade/oracle/028-HIVE-12821.oracle.sql
+hive/scripts/metastore/upgrade/oracle/029-HIVE-12822.oracle.sql
+hive/scripts/metastore/upgrade/oracle/030-HIVE-12823.oracle.sql
+hive/scripts/metastore/upgrade/oracle/031-HIVE-12381.oracle.sql
+hive/scripts/metastore/upgrade/oracle/032-HIVE-12832.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-0.10.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-0.11.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-0.12.0.oracle.sql
@@ -668,8 +803,12 @@ 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-1.1.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/hive-schema-1.2.0.oracle.sql
+hive/scripts/metastore/upgrade/oracle/hive-schema-1.3.0.oracle.sql
+hive/scripts/metastore/upgrade/oracle/hive-schema-%%HIVE_VER%%.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/hive-txn-schema-1.3.0.oracle.sql
+hive/scripts/metastore/upgrade/oracle/hive-txn-schema-%%HIVE_VER%%.oracle.sql
 hive/scripts/metastore/upgrade/oracle/pre-0-upgrade-0.13.0-to-0.14.0.oracle.sql
 hive/scripts/metastore/upgrade/oracle/upgrade-0.10.0-to-0.11.0.mysql.sql
 hive/scripts/metastore/upgrade/oracle/upgrade-0.10.0-to-0.11.0.oracle.sql
@@ -679,6 +818,8 @@ 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-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-1.2.0-to-1.3.0.oracle.sql
+hive/scripts/metastore/upgrade/oracle/upgrade-1.2.0-to-%%HIVE_VER%%.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
@@ -700,6 +841,17 @@ hive/scripts/metastore/upgrade/postgres/017-HIVE-6458.postgres.sql
 hive/scripts/metastore/upgrade/postgres/018-HIVE-6757.postgres.sql
 hive/scripts/metastore/upgrade/postgres/019-HIVE-7784.postgres.sql
 hive/scripts/metastore/upgrade/postgres/020-HIVE-9296.postgres.sql
+hive/scripts/metastore/upgrade/postgres/021-HIVE-11970.postgres.sql
+hive/scripts/metastore/upgrade/postgres/022-HIVE-12807.postgres.sql
+hive/scripts/metastore/upgrade/postgres/023-HIVE-12814.postgres.sql
+hive/scripts/metastore/upgrade/postgres/024-HIVE-12816.postgres.sql
+hive/scripts/metastore/upgrade/postgres/025-HIVE-12818.postgres.sql
+hive/scripts/metastore/upgrade/postgres/026-HIVE-12819.postgres.sql
+hive/scripts/metastore/upgrade/postgres/027-HIVE-12821.postgres.sql
+hive/scripts/metastore/upgrade/postgres/028-HIVE-12822.postgres.sql
+hive/scripts/metastore/upgrade/postgres/029-HIVE-12823.postgres.sql
+hive/scripts/metastore/upgrade/postgres/030-HIVE-12831.postgres.sql
+hive/scripts/metastore/upgrade/postgres/031-HIVE-12832.postgres.sql
 hive/scripts/metastore/upgrade/postgres/README
 hive/scripts/metastore/upgrade/postgres/hive-schema-0.10.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-schema-0.11.0.postgres.sql
@@ -716,8 +868,12 @@ 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-1.1.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/hive-schema-1.2.0.postgres.sql
+hive/scripts/metastore/upgrade/postgres/hive-schema-1.3.0.postgres.sql
+hive/scripts/metastore/upgrade/postgres/hive-schema-%%HIVE_VER%%.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/hive-txn-schema-1.3.0.postgres.sql
+hive/scripts/metastore/upgrade/postgres/hive-txn-schema-%%HIVE_VER%%.postgres.sql
 hive/scripts/metastore/upgrade/postgres/pre-0-upgrade-0.12.0-to-0.13.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/pre-0-upgrade-0.13.0-to-0.14.0.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade-0.10.0-to-0.11.0.postgres.sql
@@ -731,6 +887,8 @@ 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-1.2.0-to-1.3.0.postgres.sql
+hive/scripts/metastore/upgrade/postgres/upgrade-1.2.0-to-%%HIVE_VER%%.postgres.sql
 hive/scripts/metastore/upgrade/postgres/upgrade.order.postgres
 @dir(%%HIVE_USER%%,%%HIVE_GROUP%%,) %%HIVE_LOGDIR%%
 @dir(%%HIVE_USER%%,%%HIVE_GROUP%%,) %%HIVE_RUNDIR%%