[maven-release-plugin] prepare release drill-1.21.0
diff --git a/common/pom.xml b/common/pom.xml
index 7590bc0..49ecee2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-common</artifactId>
diff --git a/contrib/data/pom.xml b/contrib/data/pom.xml
index 6dc28cc..d42e048 100644
--- a/contrib/data/pom.xml
+++ b/contrib/data/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.contrib.data</groupId>
diff --git a/contrib/data/tpch-sample-data/pom.xml b/contrib/data/tpch-sample-data/pom.xml
index c484530..7207711 100644
--- a/contrib/data/tpch-sample-data/pom.xml
+++ b/contrib/data/tpch-sample-data/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-data-parent</artifactId>
     <groupId>org.apache.drill.contrib.data</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>tpch-sample-data</artifactId>
diff --git a/contrib/format-access/pom.xml b/contrib/format-access/pom.xml
index 45fa4e3..696a1f7 100644
--- a/contrib/format-access/pom.xml
+++ b/contrib/format-access/pom.xml
@@ -18,14 +18,12 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>drill-contrib-parent</artifactId>
         <groupId>org.apache.drill.contrib</groupId>
-        <version>1.21.0-SNAPSHOT</version>
+        <version>1.21.0</version>
     </parent>
 
     <artifactId>drill-format-msaccess</artifactId>
diff --git a/contrib/format-deltalake/pom.xml b/contrib/format-deltalake/pom.xml
index c89d38c..b2d50a8 100644
--- a/contrib/format-deltalake/pom.xml
+++ b/contrib/format-deltalake/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-deltalake-format</artifactId>
diff --git a/contrib/format-esri/pom.xml b/contrib/format-esri/pom.xml
index 45f6cc0..edfdbf2 100644
--- a/contrib/format-esri/pom.xml
+++ b/contrib/format-esri/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-esri</artifactId>
diff --git a/contrib/format-excel/pom.xml b/contrib/format-excel/pom.xml
index a74f7f7..1db9fce 100644
--- a/contrib/format-excel/pom.xml
+++ b/contrib/format-excel/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-excel</artifactId>
diff --git a/contrib/format-hdf5/pom.xml b/contrib/format-hdf5/pom.xml
index f1717a7..0a40176 100644
--- a/contrib/format-hdf5/pom.xml
+++ b/contrib/format-hdf5/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-hdf5</artifactId>
diff --git a/contrib/format-httpd/pom.xml b/contrib/format-httpd/pom.xml
index 46cce6d..583b855 100644
--- a/contrib/format-httpd/pom.xml
+++ b/contrib/format-httpd/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>drill-format-httpd</artifactId>
   <name>Drill : Contrib : Format : Httpd/Nginx Access Log</name>
diff --git a/contrib/format-iceberg/pom.xml b/contrib/format-iceberg/pom.xml
index d5e3146..4757dc1 100644
--- a/contrib/format-iceberg/pom.xml
+++ b/contrib/format-iceberg/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-iceberg-format</artifactId>
diff --git a/contrib/format-image/pom.xml b/contrib/format-image/pom.xml
index dd4f462..ae608dc 100644
--- a/contrib/format-image/pom.xml
+++ b/contrib/format-image/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-image</artifactId>
diff --git a/contrib/format-log/pom.xml b/contrib/format-log/pom.xml
index 18790c3..122f340 100644
--- a/contrib/format-log/pom.xml
+++ b/contrib/format-log/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-log</artifactId>
diff --git a/contrib/format-ltsv/pom.xml b/contrib/format-ltsv/pom.xml
index 4f7a7d7..3e95895 100644
--- a/contrib/format-ltsv/pom.xml
+++ b/contrib/format-ltsv/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-ltsv</artifactId>
diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml
index 9337286..ed980b4 100644
--- a/contrib/format-maprdb/pom.xml
+++ b/contrib/format-maprdb/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-mapr</artifactId>
diff --git a/contrib/format-pcapng/pom.xml b/contrib/format-pcapng/pom.xml
index 9bd6235..4d748d7 100644
--- a/contrib/format-pcapng/pom.xml
+++ b/contrib/format-pcapng/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-pcapng</artifactId>
diff --git a/contrib/format-pdf/pom.xml b/contrib/format-pdf/pom.xml
index 85dce65..be7e98f 100644
--- a/contrib/format-pdf/pom.xml
+++ b/contrib/format-pdf/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-pdf</artifactId>
diff --git a/contrib/format-sas/pom.xml b/contrib/format-sas/pom.xml
index 8fa76c0..0c84527 100644
--- a/contrib/format-sas/pom.xml
+++ b/contrib/format-sas/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-sas</artifactId>
diff --git a/contrib/format-spss/pom.xml b/contrib/format-spss/pom.xml
index 80aa21f..a935a29 100644
--- a/contrib/format-spss/pom.xml
+++ b/contrib/format-spss/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-spss</artifactId>
diff --git a/contrib/format-syslog/pom.xml b/contrib/format-syslog/pom.xml
index 4294a82..4cde4ed 100644
--- a/contrib/format-syslog/pom.xml
+++ b/contrib/format-syslog/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-syslog</artifactId>
diff --git a/contrib/format-xml/pom.xml b/contrib/format-xml/pom.xml
index 8e4a246..cc68179 100644
--- a/contrib/format-xml/pom.xml
+++ b/contrib/format-xml/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-format-xml</artifactId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index fa3d1d3..d744c32 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.contrib</groupId>
diff --git a/contrib/storage-cassandra/pom.xml b/contrib/storage-cassandra/pom.xml
index 19481c7..645f7c7 100644
--- a/contrib/storage-cassandra/pom.xml
+++ b/contrib/storage-cassandra/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-cassandra</artifactId>
diff --git a/contrib/storage-drill/pom.xml b/contrib/storage-drill/pom.xml
index a7f43eb..8d2d4ff 100644
--- a/contrib/storage-drill/pom.xml
+++ b/contrib/storage-drill/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage</artifactId>
diff --git a/contrib/storage-druid/pom.xml b/contrib/storage-druid/pom.xml
index 9a90ac9..bc09873 100755
--- a/contrib/storage-druid/pom.xml
+++ b/contrib/storage-druid/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>drill-contrib-parent</artifactId>
         <groupId>org.apache.drill.contrib</groupId>
-        <version>1.21.0-SNAPSHOT</version>
+        <version>1.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/contrib/storage-elasticsearch/pom.xml b/contrib/storage-elasticsearch/pom.xml
index 51a6cad..43db1b5 100644
--- a/contrib/storage-elasticsearch/pom.xml
+++ b/contrib/storage-elasticsearch/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-elasticsearch</artifactId>
diff --git a/contrib/storage-googlesheets/pom.xml b/contrib/storage-googlesheets/pom.xml
index aa6b34b..d8f32a0 100644
--- a/contrib/storage-googlesheets/pom.xml
+++ b/contrib/storage-googlesheets/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-googlesheets</artifactId>
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index 2d14bca..7fc9196 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-hbase</artifactId>
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index 4c2e68c..8812b55 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.drill.contrib.storage-hive</groupId>
     <artifactId>drill-contrib-storage-hive-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-hive-core</artifactId>
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
index 31f15aa..9341300 100644
--- a/contrib/storage-hive/hive-exec-shade/pom.xml
+++ b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.drill.contrib.storage-hive</groupId>
     <artifactId>drill-contrib-storage-hive-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-hive-exec-shaded</artifactId>
diff --git a/contrib/storage-hive/pom.xml b/contrib/storage-hive/pom.xml
index 06c77a6..18ac6c3 100644
--- a/contrib/storage-hive/pom.xml
+++ b/contrib/storage-hive/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.drill.contrib</groupId>
     <artifactId>drill-contrib-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.contrib.storage-hive</groupId>
diff --git a/contrib/storage-http/pom.xml b/contrib/storage-http/pom.xml
index 950d933..9098476 100644
--- a/contrib/storage-http/pom.xml
+++ b/contrib/storage-http/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-http</artifactId>
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index 0c1084a..d4afa61 100644
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-jdbc-storage</artifactId>
diff --git a/contrib/storage-kafka/pom.xml b/contrib/storage-kafka/pom.xml
index ff5d286..eb2828c 100644
--- a/contrib/storage-kafka/pom.xml
+++ b/contrib/storage-kafka/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-kafka</artifactId>
diff --git a/contrib/storage-kudu/pom.xml b/contrib/storage-kudu/pom.xml
index 34c744a..7d0c5c6 100644
--- a/contrib/storage-kudu/pom.xml
+++ b/contrib/storage-kudu/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-kudu-storage</artifactId>
diff --git a/contrib/storage-mongo/pom.xml b/contrib/storage-mongo/pom.xml
index f46f6ef..7ce8699 100644
--- a/contrib/storage-mongo/pom.xml
+++ b/contrib/storage-mongo/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-mongo-storage</artifactId>
diff --git a/contrib/storage-opentsdb/pom.xml b/contrib/storage-opentsdb/pom.xml
index 08609a0..4702198 100644
--- a/contrib/storage-opentsdb/pom.xml
+++ b/contrib/storage-opentsdb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>drill-contrib-parent</artifactId>
         <groupId>org.apache.drill.contrib</groupId>
-        <version>1.21.0-SNAPSHOT</version>
+        <version>1.21.0</version>
     </parent>
 
     <artifactId>drill-opentsdb-storage</artifactId>
diff --git a/contrib/storage-phoenix/pom.xml b/contrib/storage-phoenix/pom.xml
index d6a7961..6880ae8 100644
--- a/contrib/storage-phoenix/pom.xml
+++ b/contrib/storage-phoenix/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.drill.contrib</groupId>
     <artifactId>drill-contrib-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>drill-storage-phoenix</artifactId>
   <name>Drill : Contrib : Storage : Phoenix</name>
diff --git a/contrib/storage-splunk/pom.xml b/contrib/storage-splunk/pom.xml
index 8ade1b0..e309d91 100644
--- a/contrib/storage-splunk/pom.xml
+++ b/contrib/storage-splunk/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-storage-splunk</artifactId>
diff --git a/contrib/udfs/pom.xml b/contrib/udfs/pom.xml
index 435977c..c460644 100644
--- a/contrib/udfs/pom.xml
+++ b/contrib/udfs/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
     <groupId>org.apache.drill.contrib</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-udfs</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bc4f490..6266620 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>distribution</artifactId>
diff --git a/drill-yarn/pom.xml b/drill-yarn/pom.xml
index e15d5c2..c931b4c 100644
--- a/drill-yarn/pom.xml
+++ b/drill-yarn/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-yarn</artifactId>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 65d8c80..9be9c07 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>exec-parent</artifactId>
     <groupId>org.apache.drill.exec</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>drill-java-exec</artifactId>
   <name>Drill : Exec : Java Execution Engine</name>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index d2f3415..35a1c88 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -18,13 +18,12 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.drill.exec</groupId>
     <artifactId>exec-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-jdbc-all</artifactId>
@@ -326,7 +325,7 @@
             <configuration>
               <exportAntProperties>true</exportAntProperties>
               <target>
-                <property name="app.class.path" refid="maven.test.classpath"/>
+                <property name="app.class.path" refid="maven.test.classpath" />
               </target>
             </configuration>
           </execution>
@@ -818,7 +817,7 @@
     <profile>
       <id>mapr</id>
       <properties>
-        <package.namespace.prefix/>
+        <package.namespace.prefix />
       </properties>
 
       <build>
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index b74d7db..51a4d6e 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.drill.exec</groupId>
     <artifactId>exec-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>drill-jdbc</artifactId>
   <name>Drill : Exec : JDBC Driver using dependencies</name>
diff --git a/exec/memory/base/pom.xml b/exec/memory/base/pom.xml
index 3b2e769..70949d9 100644
--- a/exec/memory/base/pom.xml
+++ b/exec/memory/base/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>memory-parent</artifactId>
     <groupId>org.apache.drill.memory</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>drill-memory-base</artifactId>
   <name>Drill : Exec : Memory : Base</name>
diff --git a/exec/memory/pom.xml b/exec/memory/pom.xml
index 763519e..1f0d73d 100644
--- a/exec/memory/pom.xml
+++ b/exec/memory/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>exec-parent</artifactId>
     <groupId>org.apache.drill.exec</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.memory</groupId>
diff --git a/exec/pom.xml b/exec/pom.xml
index e968821..7de3e18 100644
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.exec</groupId>
diff --git a/exec/rpc/pom.xml b/exec/rpc/pom.xml
index 86855a2..9bf9d79 100644
--- a/exec/rpc/pom.xml
+++ b/exec/rpc/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>exec-parent</artifactId>
     <groupId>org.apache.drill.exec</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>drill-rpc</artifactId>
   <name>Drill : Exec : RPC</name>
diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml
index 23259e4..4ba3435 100644
--- a/exec/vector/pom.xml
+++ b/exec/vector/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>exec-parent</artifactId>
     <groupId>org.apache.drill.exec</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <artifactId>vector</artifactId>
   <name>Drill : Exec : Vectors</name>
diff --git a/logical/pom.xml b/logical/pom.xml
index b2fdbec..27c1b44 100644
--- a/logical/pom.xml
+++ b/logical/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-logical</artifactId>
diff --git a/metastore/iceberg-metastore/pom.xml b/metastore/iceberg-metastore/pom.xml
index 0e40ece..e8e4d84 100644
--- a/metastore/iceberg-metastore/pom.xml
+++ b/metastore/iceberg-metastore/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>metastore-parent</artifactId>
     <groupId>org.apache.drill.metastore</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-iceberg-metastore</artifactId>
diff --git a/metastore/metastore-api/pom.xml b/metastore/metastore-api/pom.xml
index 55316e4..02db201 100644
--- a/metastore/metastore-api/pom.xml
+++ b/metastore/metastore-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.drill.metastore</groupId>
     <artifactId>metastore-parent</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-metastore-api</artifactId>
diff --git a/metastore/mongo-metastore/pom.xml b/metastore/mongo-metastore/pom.xml
index f87a625..4109d16 100644
--- a/metastore/mongo-metastore/pom.xml
+++ b/metastore/mongo-metastore/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>metastore-parent</artifactId>
     <groupId>org.apache.drill.metastore</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/metastore/pom.xml b/metastore/pom.xml
index f9bca973..9f381ed 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.drill</groupId>
     <artifactId>drill-root</artifactId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.metastore</groupId>
diff --git a/metastore/rdbms-metastore/pom.xml b/metastore/rdbms-metastore/pom.xml
index b33b2c6..12299ff 100644
--- a/metastore/rdbms-metastore/pom.xml
+++ b/metastore/rdbms-metastore/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>metastore-parent</artifactId>
     <groupId>org.apache.drill.metastore</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-rdbms-metastore</artifactId>
diff --git a/pom.xml b/pom.xml
index 2435bef..83a1aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,20 +18,19 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>24</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <groupId>org.apache.drill</groupId>
   <artifactId>drill-root</artifactId>
-  <version>1.21.0-SNAPSHOT</version>
+  <version>1.21.0</version>
   <packaging>pom</packaging>
 
   <name>Drill :</name>
@@ -42,7 +41,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
-    <project.build.outputTimestamp>10</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1676437926</project.build.outputTimestamp>
     <target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
     <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
     <junit.version>5.7.2</junit.version>
@@ -65,7 +64,7 @@
     <ojai.version>3.0-mapr-1808</ojai.version>
     <kerby.version>1.0.0</kerby.version>
     <findbugs.version>3.0.0</findbugs.version>
-    <netty.tcnative.classifier/>
+    <netty.tcnative.classifier />
     <commons.io.version>2.7</commons.io.version>
     <commons.collections.version>4.4</commons.collections.version>
     <hamcrest.version>2.2</hamcrest.version>
@@ -93,7 +92,7 @@
     <jersey.version>2.34</jersey.version>
     <javax.validation.api>2.0.1.Final</javax.validation.api>
     <asm.version>9.2</asm.version>
-    <excludedGroups/>
+    <excludedGroups />
     <memoryMb>2500</memoryMb>
     <directMemoryMb>4500</directMemoryMb>
     <rat.skip>true</rat.skip>
@@ -135,14 +134,14 @@
     <univocity-parsers.version>2.8.3</univocity-parsers.version>
     <mongo.version>4.3.3</mongo.version>
     <swagger.version>2.1.12</swagger.version>
-    <junit.args/>
+    <junit.args />
   </properties>
 
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/drill.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/drill.git</developerConnection>
     <url>https://github.com/apache/drill</url>
-    <tag>HEAD</tag>
+    <tag>drill-1.21.0</tag>
   </scm>
 
   <mailingLists>
@@ -959,7 +958,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -972,7 +971,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -985,7 +984,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1000,7 +999,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1013,7 +1012,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index c752cd3..1599baa 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-protocol</artifactId>
diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index 012bd74..9a993b1 100644
--- a/tools/fmpp/pom.xml
+++ b/tools/fmpp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tools-parent</artifactId>
     <groupId>org.apache.drill.tools</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <artifactId>drill-fmpp-maven-plugin</artifactId>
diff --git a/tools/pom.xml b/tools/pom.xml
index 08a105e..c6cc569 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
-    <version>1.21.0-SNAPSHOT</version>
+    <version>1.21.0</version>
   </parent>
 
   <groupId>org.apache.drill.tools</groupId>