You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by dk...@apache.org on 2024/03/05 11:56:19 UTC
(hive) branch branch-4.0 updated: HIVE-27928: Preparing for 4.0.0 release (Denys Kuzmenko, reviewed by Ayush Saxena)
This is an automated email from the ASF dual-hosted git repository.
dkuzmenko pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new ac021bbc473 HIVE-27928: Preparing for 4.0.0 release (Denys Kuzmenko, reviewed by Ayush Saxena)
ac021bbc473 is described below
commit ac021bbc473fea8e3f405c195a0ead0c2046babf
Author: Denys Kuzmenko <de...@gmail.com>
AuthorDate: Tue Mar 5 13:56:11 2024 +0200
HIVE-27928: Preparing for 4.0.0 release (Denys Kuzmenko, reviewed by Ayush Saxena)
Closes #5116
---
accumulo-handler/pom.xml | 2 +-
beeline/pom.xml | 2 +-
classification/pom.xml | 2 +-
cli/pom.xml | 2 +-
common/pom.xml | 2 +-
contrib/pom.xml | 2 +-
druid-handler/pom.xml | 2 +-
hbase-handler/pom.xml | 2 +-
hcatalog/core/pom.xml | 2 +-
hcatalog/hcatalog-pig-adapter/pom.xml | 4 ++--
hcatalog/pom.xml | 4 ++--
hcatalog/server-extensions/pom.xml | 2 +-
hcatalog/webhcat/java-client/pom.xml | 2 +-
hcatalog/webhcat/svr/pom.xml | 2 +-
hplsql/pom.xml | 2 +-
iceberg/iceberg-catalog/pom.xml | 2 +-
iceberg/iceberg-handler/pom.xml | 2 +-
iceberg/iceberg-shading/pom.xml | 2 +-
iceberg/patched-iceberg-api/pom.xml | 2 +-
iceberg/patched-iceberg-core/pom.xml | 2 +-
iceberg/pom.xml | 4 ++--
itests/custom-serde/pom.xml | 2 +-
itests/custom-udfs/pom.xml | 2 +-
itests/custom-udfs/udf-classloader-udf1/pom.xml | 2 +-
itests/custom-udfs/udf-classloader-udf2/pom.xml | 2 +-
itests/custom-udfs/udf-classloader-util/pom.xml | 2 +-
itests/custom-udfs/udf-vectorized-badexample/pom.xml | 2 +-
itests/hcatalog-unit/pom.xml | 2 +-
itests/hive-blobstore/pom.xml | 2 +-
itests/hive-jmh/pom.xml | 2 +-
itests/hive-minikdc/pom.xml | 2 +-
itests/hive-unit-hadoop2/pom.xml | 2 +-
itests/hive-unit/pom.xml | 2 +-
itests/pom.xml | 2 +-
itests/qtest-accumulo/pom.xml | 2 +-
itests/qtest-druid/pom.xml | 2 +-
itests/qtest-iceberg/pom.xml | 2 +-
itests/qtest-kudu/pom.xml | 2 +-
itests/qtest/pom.xml | 2 +-
itests/test-serde/pom.xml | 2 +-
itests/util/pom.xml | 2 +-
jdbc-handler/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
kafka-handler/pom.xml | 2 +-
kudu-handler/pom.xml | 2 +-
llap-client/pom.xml | 2 +-
llap-common/pom.xml | 2 +-
llap-ext-client/pom.xml | 2 +-
llap-server/pom.xml | 2 +-
llap-tez/pom.xml | 2 +-
metastore/pom.xml | 2 +-
...schema-4.0.0-beta-2.hive.sql => hive-schema-4.0.0.hive.sql} | 4 ++--
.../upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.hive.sql | 3 ---
.../upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0.hive.sql | 3 +++
metastore/scripts/upgrade/hive/upgrade.order.hive | 2 +-
packaging/pom.xml | 2 +-
parser/pom.xml | 2 +-
pom.xml | 8 ++++----
ql/pom.xml | 2 +-
ql/src/test/results/clientpositive/llap/sysdb.q.out | 10 +++++-----
serde/pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
service/pom.xml | 2 +-
shims/0.23/pom.xml | 2 +-
shims/aggregator/pom.xml | 2 +-
shims/common/pom.xml | 2 +-
shims/pom.xml | 2 +-
standalone-metastore/metastore-common/pom.xml | 2 +-
standalone-metastore/metastore-server/pom.xml | 6 +++---
...hema-4.0.0-beta-2.derby.sql => hive-schema-4.0.0.derby.sql} | 2 +-
...eta-2.derby.sql => upgrade-4.0.0-beta-1-to-4.0.0.derby.sql} | 2 +-
.../metastore-server/src/main/sql/derby/upgrade.order.derby | 2 +-
...hema-4.0.0-beta-2.mssql.sql => hive-schema-4.0.0.mssql.sql} | 2 +-
...eta-2.mssql.sql => upgrade-4.0.0-beta-1-to-4.0.0.mssql.sql} | 6 +++---
.../metastore-server/src/main/sql/mssql/upgrade.order.mssql | 2 +-
...hema-4.0.0-beta-2.mysql.sql => hive-schema-4.0.0.mysql.sql} | 2 +-
...eta-2.mysql.sql => upgrade-4.0.0-beta-1-to-4.0.0.mysql.sql} | 6 +++---
.../metastore-server/src/main/sql/mysql/upgrade.order.mysql | 2 +-
...ma-4.0.0-beta-2.oracle.sql => hive-schema-4.0.0.oracle.sql} | 2 +-
...a-2.oracle.sql => upgrade-4.0.0-beta-1-to-4.0.0.oracle.sql} | 6 +++---
.../metastore-server/src/main/sql/oracle/upgrade.order.oracle | 2 +-
....0.0-beta-2.postgres.sql => hive-schema-4.0.0.postgres.sql} | 2 +-
...postgres.sql => upgrade-4.0.0-beta-1-to-4.0.0.postgres.sql} | 6 +++---
.../src/main/sql/postgres/upgrade.order.postgres | 2 +-
...a-2.postgres.sql => upgrade-3.1.3000-to-4.0.0.postgres.sql} | 6 +++---
.../metastore-tools/metastore-benchmarks/pom.xml | 2 +-
standalone-metastore/metastore-tools/pom.xml | 2 +-
standalone-metastore/metastore-tools/tools-common/pom.xml | 2 +-
standalone-metastore/pom.xml | 8 ++++----
storage-api/pom.xml | 2 +-
streaming/pom.xml | 4 ++--
testutils/pom.xml | 2 +-
udf/pom.xml | 2 +-
vector-code-gen/pom.xml | 2 +-
94 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml
index 255c9355bae..b68d2d39597 100644
--- a/accumulo-handler/pom.xml
+++ b/accumulo-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-accumulo-handler</artifactId>
diff --git a/beeline/pom.xml b/beeline/pom.xml
index a308ef8b6e2..b785a20e2b5 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-beeline</artifactId>
diff --git a/classification/pom.xml b/classification/pom.xml
index 1a5f5c08a93..e098c5d4068 100644
--- a/classification/pom.xml
+++ b/classification/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-classification</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index bec5507ffa4..5813c75c601 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-cli</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index 118c969ec45..d5e9ca576bb 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-common</artifactId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 153ce15d4ab..9cb450d6833 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-contrib</artifactId>
diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml
index 8e28088e9d2..afde6aec420 100644
--- a/druid-handler/pom.xml
+++ b/druid-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-druid-handler</artifactId>
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index e0a4c8de19a..242b80cc5f2 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hbase-handler</artifactId>
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index b0663ea530a..7a46eeaf8d4 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-core</artifactId>
diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml
index b1109d461c0..afa3be4d83d 100644
--- a/hcatalog/hcatalog-pig-adapter/pom.xml
+++ b/hcatalog/hcatalog-pig-adapter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-pig-adapter</artifactId>
@@ -152,7 +152,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml
index eaf1b82c813..1537f3c40ec 100644
--- a/hcatalog/pom.xml
+++ b/hcatalog/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hcatalog</groupId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml
index b86e9f0e04b..479101aea76 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-server-extensions</artifactId>
diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml
index 48488d7e361..6e581976b07 100644
--- a/hcatalog/webhcat/java-client/pom.xml
+++ b/hcatalog/webhcat/java-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>hive-webhcat-java-client</artifactId>
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index b4d07b34711..6076427a225 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>hive-webhcat</artifactId>
diff --git a/hplsql/pom.xml b/hplsql/pom.xml
index d6793e0ab1a..cdea4dc02c6 100644
--- a/hplsql/pom.xml
+++ b/hplsql/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hplsql</artifactId>
diff --git a/iceberg/iceberg-catalog/pom.xml b/iceberg/iceberg-catalog/pom.xml
index 3587125bcc6..1fb93911c53 100644
--- a/iceberg/iceberg-catalog/pom.xml
+++ b/iceberg/iceberg-catalog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/iceberg-handler/pom.xml b/iceberg/iceberg-handler/pom.xml
index 397898d2c61..18d16ff1992 100644
--- a/iceberg/iceberg-handler/pom.xml
+++ b/iceberg/iceberg-handler/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/iceberg-shading/pom.xml b/iceberg/iceberg-shading/pom.xml
index bcb1c889efe..950383ba604 100644
--- a/iceberg/iceberg-shading/pom.xml
+++ b/iceberg/iceberg-shading/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/patched-iceberg-api/pom.xml b/iceberg/patched-iceberg-api/pom.xml
index 81264d3d2d1..3bc5f036dad 100644
--- a/iceberg/patched-iceberg-api/pom.xml
+++ b/iceberg/patched-iceberg-api/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/patched-iceberg-core/pom.xml b/iceberg/patched-iceberg-core/pom.xml
index b0f6b7e96ac..e0692a4928c 100644
--- a/iceberg/patched-iceberg-core/pom.xml
+++ b/iceberg/patched-iceberg-core/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/iceberg/pom.xml b/iceberg/pom.xml
index ff526043692..e1eaefc4a8c 100644
--- a/iceberg/pom.xml
+++ b/iceberg/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hive-iceberg</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive Iceberg Modules</name>
<properties>
diff --git a/itests/custom-serde/pom.xml b/itests/custom-serde/pom.xml
index 99715114d4a..102fd3119f2 100644
--- a/itests/custom-serde/pom.xml
+++ b/itests/custom-serde/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-custom-serde</artifactId>
diff --git a/itests/custom-udfs/pom.xml b/itests/custom-udfs/pom.xml
index 424cab059f2..6f3814c673c 100644
--- a/itests/custom-udfs/pom.xml
+++ b/itests/custom-udfs/pom.xml
@@ -17,7 +17,7 @@ limitations under the License.
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-custom-udfs</artifactId>
diff --git a/itests/custom-udfs/udf-classloader-udf1/pom.xml b/itests/custom-udfs/udf-classloader-udf1/pom.xml
index 591713cef9b..feec5154a3a 100644
--- a/itests/custom-udfs/udf-classloader-udf1/pom.xml
+++ b/itests/custom-udfs/udf-classloader-udf1/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/custom-udfs/udf-classloader-udf2/pom.xml b/itests/custom-udfs/udf-classloader-udf2/pom.xml
index d28d3e0190d..768c48807d6 100644
--- a/itests/custom-udfs/udf-classloader-udf2/pom.xml
+++ b/itests/custom-udfs/udf-classloader-udf2/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/custom-udfs/udf-classloader-util/pom.xml b/itests/custom-udfs/udf-classloader-util/pom.xml
index aaa9f68fef5..f1a97388723 100644
--- a/itests/custom-udfs/udf-classloader-util/pom.xml
+++ b/itests/custom-udfs/udf-classloader-util/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/custom-udfs/udf-vectorized-badexample/pom.xml b/itests/custom-udfs/udf-vectorized-badexample/pom.xml
index 09ce6c5b1d7..6be30320888 100644
--- a/itests/custom-udfs/udf-vectorized-badexample/pom.xml
+++ b/itests/custom-udfs/udf-vectorized-badexample/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it-custom-udfs</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.hive-it-custom-udfs</groupId>
diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml
index 3f47452b7e3..ff083b97a05 100644
--- a/itests/hcatalog-unit/pom.xml
+++ b/itests/hcatalog-unit/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-hcatalog-it-unit</artifactId>
diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml
index b44eba77912..aab62d8de31 100644
--- a/itests/hive-blobstore/pom.xml
+++ b/itests/hive-blobstore/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-blobstore</artifactId>
diff --git a/itests/hive-jmh/pom.xml b/itests/hive-jmh/pom.xml
index defef3de685..ac62d83121a 100644
--- a/itests/hive-jmh/pom.xml
+++ b/itests/hive-jmh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-jmh</artifactId>
diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml
index c42e99591c0..a47f8ab0a71 100644
--- a/itests/hive-minikdc/pom.xml
+++ b/itests/hive-minikdc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-minikdc</artifactId>
diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml
index 0f4ca2d891b..f01faa279d2 100644
--- a/itests/hive-unit-hadoop2/pom.xml
+++ b/itests/hive-unit-hadoop2/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-unit-hadoop2</artifactId>
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 7c3b2333b9e..350c72f65fe 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-unit</artifactId>
diff --git a/itests/pom.xml b/itests/pom.xml
index 6f2cdad408d..cc6562c18e2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it</artifactId>
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index 160de3db655..cc37b87f7c1 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile-accumulo</artifactId>
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index 46ac094d26a..2dd5791580a 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>hive-it</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-druid</artifactId>
diff --git a/itests/qtest-iceberg/pom.xml b/itests/qtest-iceberg/pom.xml
index 1a7ad8be74a..5b9a16e897c 100644
--- a/itests/qtest-iceberg/pom.xml
+++ b/itests/qtest-iceberg/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>hive-it</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/itests/qtest-kudu/pom.xml b/itests/qtest-kudu/pom.xml
index 9924b0c1530..96da5f7a79d 100644
--- a/itests/qtest-kudu/pom.xml
+++ b/itests/qtest-kudu/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile-kudu</artifactId>
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index 30a6864cef5..5935dcfbf28 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-qfile</artifactId>
diff --git a/itests/test-serde/pom.xml b/itests/test-serde/pom.xml
index 5d30c102713..173a0907713 100644
--- a/itests/test-serde/pom.xml
+++ b/itests/test-serde/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-test-serde</artifactId>
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index 556879b30ab..cf35b1a6508 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-it</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-it-util</artifactId>
diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml
index 20705c1d69b..000232d2deb 100644
--- a/jdbc-handler/pom.xml
+++ b/jdbc-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-jdbc-handler</artifactId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 5ce447abd73..ddfbff57bce 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-jdbc</artifactId>
diff --git a/kafka-handler/pom.xml b/kafka-handler/pom.xml
index 007b719960a..baa4a3711e3 100644
--- a/kafka-handler/pom.xml
+++ b/kafka-handler/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kudu-handler/pom.xml b/kudu-handler/pom.xml
index faf94f51911..ce7332b88e4 100644
--- a/kudu-handler/pom.xml
+++ b/kudu-handler/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-kudu-handler</artifactId>
diff --git a/llap-client/pom.xml b/llap-client/pom.xml
index 8f18ad4acbd..d2ed9818d2b 100644
--- a/llap-client/pom.xml
+++ b/llap-client/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-client</artifactId>
diff --git a/llap-common/pom.xml b/llap-common/pom.xml
index 38fc22d6bd2..3e478b0e68d 100644
--- a/llap-common/pom.xml
+++ b/llap-common/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-common</artifactId>
diff --git a/llap-ext-client/pom.xml b/llap-ext-client/pom.xml
index 439064091ae..0d50f1a6604 100644
--- a/llap-ext-client/pom.xml
+++ b/llap-ext-client/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-ext-client</artifactId>
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 1e04914b1a8..f6dc2fdb603 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-server</artifactId>
diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml
index 79b665ba878..9ca49178487 100644
--- a/llap-tez/pom.xml
+++ b/llap-tez/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-llap-tez</artifactId>
diff --git a/metastore/pom.xml b/metastore/pom.xml
index 231a0d2e3da..b5a4134c6f2 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-metastore</artifactId>
diff --git a/metastore/scripts/upgrade/hive/hive-schema-4.0.0-beta-2.hive.sql b/metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql
similarity index 99%
rename from metastore/scripts/upgrade/hive/hive-schema-4.0.0-beta-2.hive.sql
rename to metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql
index 51eb17df42d..689bb763389 100644
--- a/metastore/scripts/upgrade/hive/hive-schema-4.0.0-beta-2.hive.sql
+++ b/metastore/scripts/upgrade/hive/hive-schema-4.0.0.hive.sql
@@ -823,8 +823,8 @@ FROM
\"PART_COL_STATS\""
);
-CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0-beta-2' AS `SCHEMA_VERSION`,
- 'Hive release version 4.0.0-beta-2' AS `VERSION_COMMENT`;
+CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0' AS `SCHEMA_VERSION`,
+ 'Hive release version 4.0.0' AS `VERSION_COMMENT`;
CREATE EXTERNAL TABLE IF NOT EXISTS `DB_VERSION` (
`VER_ID` BIGINT,
diff --git a/metastore/scripts/upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.hive.sql b/metastore/scripts/upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.hive.sql
deleted file mode 100644
index 4ba19c30dc1..00000000000
--- a/metastore/scripts/upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.hive.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2';
-
-SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2';
diff --git a/metastore/scripts/upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0.hive.sql b/metastore/scripts/upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0.hive.sql
new file mode 100644
index 00000000000..aa2be181b0e
--- /dev/null
+++ b/metastore/scripts/upgrade/hive/upgrade-4.0.0-beta-1-to-4.0.0.hive.sql
@@ -0,0 +1,3 @@
+SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0';
+
+SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0';
diff --git a/metastore/scripts/upgrade/hive/upgrade.order.hive b/metastore/scripts/upgrade/hive/upgrade.order.hive
index 4ab1e7a5411..c5800c2463c 100644
--- a/metastore/scripts/upgrade/hive/upgrade.order.hive
+++ b/metastore/scripts/upgrade/hive/upgrade.order.hive
@@ -2,4 +2,4 @@
3.1.0-to-4.0.0-alpha-1.hive
4.0.0-alpha-1-to-4.0.0-alpha-2.hive
4.0.0-alpha-2-to-4.0.0-beta-1.hive
-4.0.0-beta-1-to-4.0.0-beta-2.hive
\ No newline at end of file
+4.0.0-beta-1-to-4.0.0.hive
\ No newline at end of file
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 9a25658475d..4c96eda1a26 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-packaging</artifactId>
diff --git a/parser/pom.xml b/parser/pom.xml
index e9dddbf00bc..b1049bab091 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-parser</artifactId>
diff --git a/pom.xml b/pom.xml
index 384aa676aaf..07b5bbcfce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive</name>
<url>https://hive.apache.org</url>
@@ -61,8 +61,8 @@
<module>kafka-handler</module>
</modules>
<properties>
- <standalone-metastore.version>4.0.0-beta-2-SNAPSHOT</standalone-metastore.version>
- <hive.version.shortname>4.0.0-beta-2</hive.version.shortname>
+ <standalone-metastore.version>4.0.0-SNAPSHOT</standalone-metastore.version>
+ <hive.version.shortname>4.0.0</hive.version.shortname>
<!-- Build Properties -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -197,7 +197,7 @@
<stax.version>1.0.1</stax.version>
<slf4j.version>1.7.30</slf4j.version>
<ST4.version>4.0.4</ST4.version>
- <storage-api.version>4.0.0-beta-2-SNAPSHOT</storage-api.version>
+ <storage-api.version>4.0.0-SNAPSHOT</storage-api.version>
<tez.version>0.10.3</tez.version>
<super-csv.version>2.2.0</super-csv.version>
<tempus-fugit.version>1.1</tempus-fugit.version>
diff --git a/ql/pom.xml b/ql/pom.xml
index 2b58b165abe..a47ac52a9f9 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-exec</artifactId>
diff --git a/ql/src/test/results/clientpositive/llap/sysdb.q.out b/ql/src/test/results/clientpositive/llap/sysdb.q.out
index c2cdcbe4f93..633c0d40556 100644
--- a/ql/src/test/results/clientpositive/llap/sysdb.q.out
+++ b/ql/src/test/results/clientpositive/llap/sysdb.q.out
@@ -1482,7 +1482,7 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: _dummy_database@_dummy_table
POSTHOOK: Input: sys@version
#### A masked pattern was here ####
-4.0.0-beta-2
+4.0.0
PREHOOK: query: select func_name, func_type from funcs order by func_name, func_type limit 5
PREHOOK: type: QUERY
PREHOOK: Input: sys@funcs
@@ -1640,8 +1640,8 @@ POSTHOOK: Input: sys@compaction_queue
POSTHOOK: Input: sys@compactions
POSTHOOK: Input: sys@completed_compactions
#### A masked pattern was here ####
-1 default default scr_txn NULL major initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-beta-2-SNAPSHOT NULL default NULL NULL
-2 default default scr_txn_2 NULL minor initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-beta-2-SNAPSHOT NULL default NULL NULL
+1 default default scr_txn NULL major initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-SNAPSHOT NULL default NULL NULL
+2 default default scr_txn_2 NULL minor initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-SNAPSHOT NULL default NULL NULL
PREHOOK: query: use INFORMATION_SCHEMA
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:information_schema
@@ -1876,8 +1876,8 @@ POSTHOOK: Input: sys@dbs
POSTHOOK: Input: sys@tbl_privs
POSTHOOK: Input: sys@tbls
#### A masked pattern was here ####
-1 default default scr_txn NULL major initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-beta-2-SNAPSHOT NULL default NULL NULL
-2 default default scr_txn_2 NULL minor initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-beta-2-SNAPSHOT NULL default NULL NULL
+1 default default scr_txn NULL major initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-SNAPSHOT NULL default NULL NULL
+2 default default scr_txn_2 NULL minor initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-SNAPSHOT NULL default NULL NULL
PREHOOK: query: select TXN_ID, STATE, AGENT_INFO, META_INFO, HEARTBEAT_COUNT, TYPE, TC_DATABASE, TC_TABLE, TC_PARTITION, TC_OPERATION_TYPE, TC_WRITEID from TRANSACTIONS
PREHOOK: type: QUERY
PREHOOK: Input: information_schema@transactions
diff --git a/serde/pom.xml b/serde/pom.xml
index 4d391bfcf56..1a346ae2328 100644
--- a/serde/pom.xml
+++ b/serde/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-serde</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index c6d66459cee..133f35704c9 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-service-rpc</artifactId>
diff --git a/service/pom.xml b/service/pom.xml
index 4a1515809e6..bb209c7ac81 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-service</artifactId>
diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml
index 54602203fb3..f01d570fb20 100644
--- a/shims/0.23/pom.xml
+++ b/shims/0.23/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.shims</groupId>
diff --git a/shims/aggregator/pom.xml b/shims/aggregator/pom.xml
index 47758421fa3..9ad5c8807ac 100644
--- a/shims/aggregator/pom.xml
+++ b/shims/aggregator/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>hive-shims</artifactId>
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
index 9d46c03d124..e7129687e53 100644
--- a/shims/common/pom.xml
+++ b/shims/common/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.hive.shims</groupId>
diff --git a/shims/pom.xml b/shims/pom.xml
index 45ce1c5e95a..83d653ad21b 100644
--- a/shims/pom.xml
+++ b/shims/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-shims-aggregator</artifactId>
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index 8256f15ecbe..819338f02eb 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-standalone-metastore</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hive-standalone-metastore-common</artifactId>
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index 2268c71031c..eb35df89021 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-standalone-metastore</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hive-standalone-metastore-server</artifactId>
@@ -28,12 +28,12 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-common</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
similarity index 99%
rename from standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql
rename to standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
index 3b9d46700e4..4ef57f4960d 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
@@ -874,4 +874,4 @@ ALTER TABLE "PACKAGES" ADD CONSTRAINT "PACKAGES_FK1" FOREIGN KEY ("DB_ID") REFER
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0-beta-2', 'Hive release version 4.0.0-beta-2');
+INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0', 'Hive release version 4.0.0');
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0.derby.sql
similarity index 72%
rename from standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql
rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0.derby.sql
index 525a7d5215e..69ce0927bb9 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0.derby.sql
@@ -7,4 +7,4 @@ DROP INDEX "APP"."UNIQUEPARTITION";
CREATE UNIQUE INDEX "APP"."UNIQUEPARTITION" ON "APP"."PARTITIONS" ("TBL_ID", "PART_NAME");
-- This needs to be the last thing done. Insert any changes above this line.
-UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive release version 4.0.0-beta-2' where VER_ID=1;
+UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
index 809b719e732..da2ab69937d 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
@@ -19,4 +19,4 @@
3.2.0-to-4.0.0-alpha-1
4.0.0-alpha-1-to-4.0.0-alpha-2
4.0.0-alpha-2-to-4.0.0-beta-1
-4.0.0-beta-1-to-4.0.0-beta-2
+4.0.0-beta-1-to-4.0.0
diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
similarity index 99%
rename from standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql
rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
index 2bbf62d5f1c..7866e87eba1 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
@@ -1422,4 +1422,4 @@ CREATE INDEX DC_PRIVS_N49 ON DC_PRIVS (NAME);
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0-beta-2', 'Hive release version 4.0.0-beta-2');
+INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0', 'Hive release version 4.0.0');
diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0.mssql.sql
similarity index 63%
rename from standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql
rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0.mssql.sql
index f7ded61aef9..6bb3a37e938 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0.mssql.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS MESSAGE;
+SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0' AS MESSAGE;
-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
DROP TABLE INDEX_PARAMS;
@@ -10,5 +10,5 @@ CREATE UNIQUE INDEX UNIQUEPARTITION ON PARTITIONS (TBL_ID,PART_NAME);
DROP INDEX PARTITIONS_N50 ON PARTITIONS;
-- These lines need to be last. Insert any changes above.
-UPDATE VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive release version 4.0.0-beta-2' where VER_ID=1;
-SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS MESSAGE;
+UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
+SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0' AS MESSAGE;
diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
index c12e1d9ed7c..2f1031f89da 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql
@@ -13,4 +13,4 @@
3.2.0-to-4.0.0-alpha-1
4.0.0-alpha-1-to-4.0.0-alpha-2
4.0.0-alpha-2-to-4.0.0-beta-1
-4.0.0-beta-1-to-4.0.0-beta-2
+4.0.0-beta-1-to-4.0.0
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
similarity index 99%
rename from standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql
rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
index f99632267a8..816a33d21bd 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
@@ -1343,7 +1343,7 @@ CREATE TABLE IF NOT EXISTS `DC_PRIVS` (
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0-beta-2', 'Hive release version 4.0.0-beta-2');
+INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0', 'Hive release version 4.0.0');
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0.mysql.sql
similarity index 63%
rename from standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql
rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0.mysql.sql
index a57b58b2f7b..dd4a76033e4 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0.mysql.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS MESSAGE;
+SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0' AS MESSAGE;
-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
DROP TABLE `INDEX_PARAMS`;
@@ -10,5 +10,5 @@ CREATE UNIQUE INDEX UNIQUEPARTITION ON PARTITIONS (TBL_ID, PART_NAME);
DROP INDEX PARTITIONS_N49 on PARTITIONS;
-- These lines need to be last. Insert any changes above.
-UPDATE VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive release version 4.0.0-beta-2' where VER_ID=1;
-SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS MESSAGE;
+UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
+SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0' AS MESSAGE;
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
index 809b719e732..da2ab69937d 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql
@@ -19,4 +19,4 @@
3.2.0-to-4.0.0-alpha-1
4.0.0-alpha-1-to-4.0.0-alpha-2
4.0.0-alpha-2-to-4.0.0-beta-1
-4.0.0-beta-1-to-4.0.0-beta-2
+4.0.0-beta-1-to-4.0.0
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
similarity index 99%
rename from standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql
rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
index d4026910343..07fd214c4b6 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
@@ -1319,4 +1319,4 @@ CREATE INDEX DC_PRIVS_N49 ON DC_PRIVS (NAME);
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0-beta-2', 'Hive release version 4.0.0-beta-2');
+INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0', 'Hive release version 4.0.0');
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0.oracle.sql
similarity index 59%
rename from standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql
rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0.oracle.sql
index ab163b6cd00..ca98a0914fd 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0.oracle.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS Status from dual;
+SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0' AS Status from dual;
-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
@@ -11,5 +11,5 @@ CREATE UNIQUE INDEX UNIQUEPARTITION ON PARTITIONS (TBL_ID, PART_NAME);
DROP INDEX PARTITIONS_N50;
-- These lines need to be last. Insert any changes above.
-UPDATE VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive release version 4.0.0-beta-2' where VER_ID=1;
-SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS Status from dual;
+UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
+SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0' AS Status from dual;
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
index 20b3a483434..bab5fcf706a 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle
@@ -15,4 +15,4 @@
3.2.0-to-4.0.0-alpha-1
4.0.0-alpha-1-to-4.0.0-alpha-2
4.0.0-alpha-2-to-4.0.0-beta-1
-4.0.0-beta-1-to-4.0.0-beta-2
+4.0.0-beta-1-to-4.0.0
diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql
similarity index 99%
rename from standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql
rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql
index 292bc200fca..7b09f72da85 100644
--- a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql
@@ -1966,4 +1966,4 @@ ALTER TABLE ONLY "DC_PRIVS"
-- -----------------------------------------------------------------
-- Record schema version. Should be the last step in the init script
-- -----------------------------------------------------------------
-INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '4.0.0-beta-2', 'Hive release version 4.0.0-beta-2');
+INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '4.0.0', 'Hive release version 4.0.0');
diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0.postgres.sql
similarity index 67%
rename from standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql
rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0.postgres.sql
index af17c7d9524..8393ec260ce 100644
--- a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0.postgres.sql
@@ -1,4 +1,4 @@
-SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2';
+SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0';
-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
DROP TABLE IF EXISTS "INDEX_PARAMS";
@@ -10,5 +10,5 @@ ALTER TABLE ONLY "PARTITIONS" ADD CONSTRAINT "UNIQUEPARTITION" UNIQUE ("TBL_ID",
DROP INDEX "PARTITIONS_N49";
-- These lines need to be last. Insert any changes above.
-UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0-beta-2', "VERSION_COMMENT"='Hive release version 4.0.0-beta-2' where "VER_ID"=1;
-SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2';
+UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0', "VERSION_COMMENT"='Hive release version 4.0.0' where "VER_ID"=1;
+SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0';
diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
index 809b719e732..da2ab69937d 100644
--- a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
+++ b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres
@@ -19,4 +19,4 @@
3.2.0-to-4.0.0-alpha-1
4.0.0-alpha-1-to-4.0.0-alpha-2
4.0.0-alpha-2-to-4.0.0-beta-1
-4.0.0-beta-1-to-4.0.0-beta-2
+4.0.0-beta-1-to-4.0.0
diff --git a/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0-beta-2.postgres.sql b/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql
similarity index 96%
rename from standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0-beta-2.postgres.sql
rename to standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql
index aec13352cac..b70634aefb3 100644
--- a/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0-beta-2.postgres.sql
+++ b/standalone-metastore/metastore-server/src/test/resources/sql/postgres/upgrade-3.1.3000-to-4.0.0.postgres.sql
@@ -1,5 +1,5 @@
-- The file has some overlapping with upgrade-3.2.0-to-4.0.0.postgres.sql
-SELECT 'Upgrading MetaStore schema from 3.1.3000 to 4.0.0-beta-2';
+SELECT 'Upgrading MetaStore schema from 3.1.3000 to 4.0.0';
-- HIVE-20793
ALTER TABLE "WM_RESOURCEPLAN" ADD "NS" character varying(128);
@@ -160,5 +160,5 @@ CREATE TABLE "MIN_HISTORY_WRITE_ID" (
);
-- These lines need to be last. Insert any changes above.
-UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0-beta-2', "VERSION_COMMENT"='Hive release version 4.0.0-beta-2' where "VER_ID"=1;
-SELECT 'Finished upgrading MetaStore schema from 3.1.3000 to 4.0.0-beta-2';
+UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0', "VERSION_COMMENT"='Hive release version 4.0.0' where "VER_ID"=1;
+SELECT 'Finished upgrading MetaStore schema from 3.1.3000 to 4.0.0';
diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
index 72323540ddb..56e1d86e1dc 100644
--- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
+++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-metastore-tools</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml
index 551647d5c70..e9860f4ef0d 100644
--- a/standalone-metastore/metastore-tools/pom.xml
+++ b/standalone-metastore/metastore-tools/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hive-standalone-metastore</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<groupId>org.apache.hive</groupId>
</parent>
<artifactId>hive-metastore-tools</artifactId>
diff --git a/standalone-metastore/metastore-tools/tools-common/pom.xml b/standalone-metastore/metastore-tools/tools-common/pom.xml
index 9c253d1950b..fda8ef91de2 100644
--- a/standalone-metastore/metastore-tools/tools-common/pom.xml
+++ b/standalone-metastore/metastore-tools/tools-common/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hive-metastore-tools</artifactId>
<groupId>org.apache.hive</groupId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 6ffcdd64393..58fe5fd9512 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hive Standalone Metastore</name>
<modules>
@@ -30,8 +30,8 @@
<module>metastore-tools</module>
</modules>
<properties>
- <hive.version>4.0.0-beta-2-SNAPSHOT</hive.version>
- <hive.version.shortname>4.0.0-beta-2</hive.version.shortname>
+ <hive.version>4.0.0-SNAPSHOT</hive.version>
+ <hive.version.shortname>4.0.0</hive.version.shortname>
<standalone.metastore.path.to.root>.</standalone.metastore.path.to.root>
<!-- Build properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -95,7 +95,7 @@
<sqlline.version>1.9.0</sqlline.version>
<jline.version>2.14.6</jline.version>
<ST4.version>4.0.4</ST4.version>
- <storage-api.version>4.0.0-beta-2-SNAPSHOT</storage-api.version>
+ <storage-api.version>4.0.0-SNAPSHOT</storage-api.version>
<beanutils.version>1.9.4</beanutils.version>
<hamcrest.version>1.3</hamcrest.version>
<curator.version>5.2.0</curator.version>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 5310a980b45..8af21459bb1 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hive Storage API</name>
<properties>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 456e6f069e8..69639db5e01 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-streaming</artifactId>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 316287e51e9..e07dbe5e315 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-testutils</artifactId>
diff --git a/udf/pom.xml b/udf/pom.xml
index 255feca1515..bff1d7c8f4a 100644
--- a/udf/pom.xml
+++ b/udf/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-udf</artifactId>
diff --git a/vector-code-gen/pom.xml b/vector-code-gen/pom.xml
index bf5f126ce35..b26aa23d160 100644
--- a/vector-code-gen/pom.xml
+++ b/vector-code-gen/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
- <version>4.0.0-beta-2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-vector-code-gen</artifactId>