diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 32275d9..42cd29e 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-cassandra</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Cassandra</name>
   <description>Cassandra adapter for Calcite</description>
 
diff --git a/core/pom.xml b/core/pom.xml
index d868291..c72c3cc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-core</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Core</name>
   <description>Core Calcite APIs and engine.</description>
 
diff --git a/druid/pom.xml b/druid/pom.xml
index dc82fec..548a601 100644
--- a/druid/pom.xml
+++ b/druid/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-druid</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Druid</name>
   <description>Druid adapter for Calcite</description>
 
diff --git a/elasticsearch2/pom.xml b/elasticsearch2/pom.xml
index d4694e2..f24622c 100644
--- a/elasticsearch2/pom.xml
+++ b/elasticsearch2/pom.xml
@@ -21,12 +21,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-elasticsearch2</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Elasticsearch</name>
   <description>Elasticsearch adapter for Calcite</description>
 
diff --git a/elasticsearch5/pom.xml b/elasticsearch5/pom.xml
index 40f05a8..21d60f1 100644
--- a/elasticsearch5/pom.xml
+++ b/elasticsearch5/pom.xml
@@ -21,12 +21,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-elasticsearch5</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Elasticsearch5</name>
   <description>Elasticsearch5 adapter for Calcite</description>
 
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 8acc83a..4dd7dab 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite-example</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-example-csv</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Example CSV</name>
   <description>An example Calcite provider that reads CSV files</description>
 
diff --git a/example/function/pom.xml b/example/function/pom.xml
index 011ac58..77c424b 100644
--- a/example/function/pom.xml
+++ b/example/function/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite-example</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-example-function</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Example Function</name>
   <description>Examples of user-defined Calcite functions</description>
 
diff --git a/example/pom.xml b/example/pom.xml
index 3e577a1..163f2d6 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-example</artifactId>
   <packaging>pom</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Examples</name>
   <description>Calcite examples</description>
 
diff --git a/file/pom.xml b/file/pom.xml
index 8ebdebb..6f21dce 100644
--- a/file/pom.xml
+++ b/file/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-file</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite File</name>
   <description>Calcite provider that reads files and URIs</description>
 
diff --git a/geode/pom.xml b/geode/pom.xml
index 7e6663d..6960d0d 100644
--- a/geode/pom.xml
+++ b/geode/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-geode</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Geode</name>
   <description>Geode adapter for Calcite</description>
 
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 9823039..b0c951e 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-linq4j</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Linq4j</name>
   <description>Calcite APIs for LINQ (Language-Integrated Query) in Java</description>
 
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 215c03a..8393706 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-mongodb</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite MongoDB</name>
   <description>MongoDB adapter for Calcite</description>
 
diff --git a/pig/pom.xml b/pig/pom.xml
index a470f64..e5da002 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-pig</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Pig</name>
   <description>Pig adapter for Calcite</description>
 
diff --git a/piglet/pom.xml b/piglet/pom.xml
index 9fdfc80..746370c 100644
--- a/piglet/pom.xml
+++ b/piglet/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-piglet</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Piglet</name>
   <description>Pig-like language built on top of Calcite algebra</description>
 
diff --git a/plus/pom.xml b/plus/pom.xml
index ab8deeb..c169a58 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-plus</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Plus</name>
   <description>Miscellaneous extras for Calcite</description>
 
diff --git a/pom.xml b/pom.xml
index 436dcd8..956b677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   <groupId>org.apache.calcite</groupId>
   <artifactId>calcite</artifactId>
   <packaging>pom</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
 
   <!-- More project information. -->
   <name>Calcite</name>
@@ -143,7 +143,7 @@
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</developerConnection>
     <url>https://github.com/apache/calcite</url>
-    <tag>calcite-1.16.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <modules>
diff --git a/server/pom.xml b/server/pom.xml
index e1d0aa1..ef6babe 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-server</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Server</name>
   <description>Calcite Server</description>
 
diff --git a/spark/pom.xml b/spark/pom.xml
index 61f8d08..8a2cff2 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-spark</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Spark</name>
 
   <properties>
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 1f1deb9..08f7190 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>calcite-splunk</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0</version>
+  <version>1.17.0-SNAPSHOT</version>
   <name>Calcite Splunk</name>
   <description>Splunk adapter for Calcite; also a JDBC driver for Splunk</description>
 
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index f3923f2..d6e8a9f 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>