This is an automated email from the ASF dual-hosted git repository. kgyrtkirk pushed a commit to branch branch-3 in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3 by this push: new 0571341 HIVE-22704: Distribution package incorrectly ships the upgrade.order files from the metastore module (Zoltan Haindrich reviewed by Naveen Gangam) 0571341 is described below commit 0571341dad8b11ce777416b5a636c35bc00969ba Author: Zoltan Haindrich <k...@rxd.hu> AuthorDate: Mon Jan 13 15:13:25 2020 +0000 HIVE-22704: Distribution package incorrectly ships the upgrade.order files from the metastore module (Zoltan Haindrich reviewed by Naveen Gangam) Signed-off-by: Zoltan Haindrich <k...@rxd.hu> (cherry picked from commit 36add83194655dd5f6489100ddee18014c69349b) --- metastore/scripts/upgrade/derby/upgrade.order.derby | 17 ----------------- metastore/scripts/upgrade/mssql/upgrade.order.mssql | 11 ----------- metastore/scripts/upgrade/mysql/upgrade.order.mysql | 17 ----------------- metastore/scripts/upgrade/oracle/upgrade.order.oracle | 13 ------------- .../scripts/upgrade/postgres/upgrade.order.postgres | 17 ----------------- packaging/src/main/assembly/bin.xml | 4 ---- 6 files changed, 79 deletions(-) diff --git a/metastore/scripts/upgrade/derby/upgrade.order.derby b/metastore/scripts/upgrade/derby/upgrade.order.derby deleted file mode 100644 index f43da9a..0000000 --- a/metastore/scripts/upgrade/derby/upgrade.order.derby +++ /dev/null @@ -1,17 +0,0 @@ -0.5.0-to-0.6.0 -0.6.0-to-0.7.0 -0.7.0-to-0.8.0 -0.8.0-to-0.9.0 -0.9.0-to-0.10.0 -0.10.0-to-0.11.0 -0.11.0-to-0.12.0 -0.12.0-to-0.13.0 -0.13.0-to-0.14.0 -0.14.0-to-1.1.0 -1.1.0-to-1.2.0 -1.2.0-to-2.0.0 -2.0.0-to-2.1.0 -2.1.0-to-2.2.0 -2.2.0-to-2.3.0 -2.3.0-to-3.0.0 -3.0.0-to-3.1.0 diff --git a/metastore/scripts/upgrade/mssql/upgrade.order.mssql b/metastore/scripts/upgrade/mssql/upgrade.order.mssql deleted file mode 100644 index 5572c26..0000000 --- a/metastore/scripts/upgrade/mssql/upgrade.order.mssql +++ /dev/null @@ -1,11 +0,0 @@ -0.11.0-to-0.12.0 -0.12.0-to-0.13.0 -0.13.0-to-0.14.0 -0.14.0-to-1.1.0 -1.1.0-to-1.2.0 -1.2.0-to-2.0.0 -2.0.0-to-2.1.0 -2.1.0-to-2.2.0 -2.2.0-to-2.3.0 -2.3.0-to-3.0.0 -3.0.0-to-3.1.0 diff --git a/metastore/scripts/upgrade/mysql/upgrade.order.mysql b/metastore/scripts/upgrade/mysql/upgrade.order.mysql deleted file mode 100644 index f43da9a..0000000 --- a/metastore/scripts/upgrade/mysql/upgrade.order.mysql +++ /dev/null @@ -1,17 +0,0 @@ -0.5.0-to-0.6.0 -0.6.0-to-0.7.0 -0.7.0-to-0.8.0 -0.8.0-to-0.9.0 -0.9.0-to-0.10.0 -0.10.0-to-0.11.0 -0.11.0-to-0.12.0 -0.12.0-to-0.13.0 -0.13.0-to-0.14.0 -0.14.0-to-1.1.0 -1.1.0-to-1.2.0 -1.2.0-to-2.0.0 -2.0.0-to-2.1.0 -2.1.0-to-2.2.0 -2.2.0-to-2.3.0 -2.3.0-to-3.0.0 -3.0.0-to-3.1.0 diff --git a/metastore/scripts/upgrade/oracle/upgrade.order.oracle b/metastore/scripts/upgrade/oracle/upgrade.order.oracle deleted file mode 100644 index 72b8303..0000000 --- a/metastore/scripts/upgrade/oracle/upgrade.order.oracle +++ /dev/null @@ -1,13 +0,0 @@ -0.9.0-to-0.10.0 -0.10.0-to-0.11.0 -0.11.0-to-0.12.0 -0.12.0-to-0.13.0 -0.13.0-to-0.14.0 -0.14.0-to-1.1.0 -1.1.0-to-1.2.0 -1.2.0-to-2.0.0 -2.0.0-to-2.1.0 -2.1.0-to-2.2.0 -2.2.0-to-2.3.0 -2.3.0-to-3.0.0 -3.0.0-to-3.1.0 diff --git a/metastore/scripts/upgrade/postgres/upgrade.order.postgres b/metastore/scripts/upgrade/postgres/upgrade.order.postgres deleted file mode 100644 index f43da9a..0000000 --- a/metastore/scripts/upgrade/postgres/upgrade.order.postgres +++ /dev/null @@ -1,17 +0,0 @@ -0.5.0-to-0.6.0 -0.6.0-to-0.7.0 -0.7.0-to-0.8.0 -0.8.0-to-0.9.0 -0.9.0-to-0.10.0 -0.10.0-to-0.11.0 -0.11.0-to-0.12.0 -0.12.0-to-0.13.0 -0.13.0-to-0.14.0 -0.14.0-to-1.1.0 -1.1.0-to-1.2.0 -1.2.0-to-2.0.0 -2.0.0-to-2.1.0 -2.1.0-to-2.2.0 -2.2.0-to-2.3.0 -2.3.0-to-3.0.0 -3.0.0-to-3.1.0 diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml index 2dd9260..6b2d678 100644 --- a/packaging/src/main/assembly/bin.xml +++ b/packaging/src/main/assembly/bin.xml @@ -214,10 +214,6 @@ <includes> <include>**/*</include> </includes> - <excludes> - <!-- pick up upgrade order from standalone metastore, except hive, which does not exist in standalone metastore --> - <exclude>%regex[(!hive)/upgrade.order.*]</exclude> - </excludes> <outputDirectory>scripts/metastore/upgrade</outputDirectory> </fileSet>