diff --git a/extensions/guacamole-auth-ban/pom.xml b/extensions/guacamole-auth-ban/pom.xml
index 878ce2d44..31836ef85 100644
--- a/extensions/guacamole-auth-ban/pom.xml
+++ b/extensions/guacamole-auth-ban/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-ban</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-ban</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
@@ -51,8 +49,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
 
             <!-- Exclude transitive dependencies that will be overridden by
                 newer versions required by Caffeine -->
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index 5e0838175..2a79804d5 100644
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-duo</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-duo</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <properties>
@@ -49,8 +47,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
         
         <!-- Guava - Utility Library -->
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index 7b8b1fb8a..acf0d8616 100644
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-header</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-header</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
@@ -43,8 +41,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Guice -->
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
index f099b65b4..d5704af46 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -50,7 +50,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- MyBatis -->
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
index feff11694..ad767fb35 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -42,21 +42,21 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-mysql</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <!-- PostgreSQL Authentication Extension -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <!-- SQL Server Authentication Extension -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index a0c733af2..523235830 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -42,14 +42,13 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole JDBC Authentication -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-base</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
index 6b2d61ebf..58922a4c1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -42,14 +42,13 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole JDBC Authentication -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-base</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
index 6102eba60..17f888e6e 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-jdbc</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -42,14 +42,13 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole JDBC Authentication -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-jdbc-base</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 99a9fd366..13644f1b6 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-jdbc</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-jdbc</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <modules>
@@ -52,18 +50,4 @@
 
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- Guacamole Extension API -->
-            <dependency>
-                <groupId>org.apache.guacamole</groupId>
-                <artifactId>guacamole-ext</artifactId>
-                <version>1.6.1</version>
-                <scope>provided</scope>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
 </project>
diff --git a/extensions/guacamole-auth-json/pom.xml b/extensions/guacamole-auth-json/pom.xml
index bd477d9df..dc4a8ebe1 100644
--- a/extensions/guacamole-auth-json/pom.xml
+++ b/extensions/guacamole-auth-json/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-json</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-json</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
@@ -43,8 +41,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Guice -->
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 46b9f50e0..fa5083f01 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-ldap</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-ldap</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
@@ -43,8 +41,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Apache Directory LDAP API -->
diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml
index f16560c12..730d7fbc5 100644
--- a/extensions/guacamole-auth-quickconnect/pom.xml
+++ b/extensions/guacamole-auth-quickconnect/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-quickconnect</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-quickconnect</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <build>
@@ -98,8 +96,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
         
         <!-- Guice -->
diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index 6ba9993ea..78a367b36 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-radius</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-radius</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <build>
@@ -115,8 +113,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
         
         <!-- Guava - Utility Library -->
diff --git a/extensions/guacamole-auth-restrict/pom.xml b/extensions/guacamole-auth-restrict/pom.xml
index 78a3c120b..9379616a4 100644
--- a/extensions/guacamole-auth-restrict/pom.xml
+++ b/extensions/guacamole-auth-restrict/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-restrict</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-restrict</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <build>
@@ -127,8 +125,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
         
         <!-- Guava - Utility Library -->
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml
index 264907dcd..0ce3fef2f 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-sso</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
index ef7d6737c..75c381ebb 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
@@ -26,14 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-sso-cas</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-sso-cas</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-sso</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml
index a8777b900..814e2b8c7 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-sso</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -42,28 +42,28 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-sso-cas</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <!-- OpenID Authentication Extension -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-sso-openid</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <!-- SAML Authentication Extension -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-sso-saml</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <!-- SSL Authentication Extension -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-auth-sso-ssl</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
index 7759d12a2..14ab1b36b 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
@@ -26,14 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-sso-openid</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-sso-openid</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-sso</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
index c70e05c47..67515beab 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
@@ -26,14 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-sso-saml</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-sso-saml</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-sso</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml
index 44f7e0edd..2186713ec 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml
@@ -26,14 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-sso-ssl</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-sso-ssl</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-auth-sso</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/extensions/guacamole-auth-sso/pom.xml b/extensions/guacamole-auth-sso/pom.xml
index 071c1f181..caed3815f 100644
--- a/extensions/guacamole-auth-sso/pom.xml
+++ b/extensions/guacamole-auth-sso/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-sso</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-sso</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <modules>
@@ -56,19 +54,11 @@
     <dependencyManagement>
         <dependencies>
 
-            <!-- Guacamole Extension API -->
-            <dependency>
-                <groupId>org.apache.guacamole</groupId>
-                <artifactId>guacamole-ext</artifactId>
-                <version>1.6.1</version>
-                <scope>provided</scope>
-            </dependency>
-
             <!-- Core SSO support -->
             <dependency>
                 <groupId>org.apache.guacamole</groupId>
                 <artifactId>guacamole-auth-sso-base</artifactId>
-                <version>1.6.1</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- Java servlet API -->
diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml
index 090eaa1ec..7016b041d 100644
--- a/extensions/guacamole-auth-totp/pom.xml
+++ b/extensions/guacamole-auth-totp/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-totp</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-auth-totp</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <build>
@@ -127,8 +125,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
         
         <!-- Guava - Utility Library -->
diff --git a/extensions/guacamole-display-statistics/pom.xml b/extensions/guacamole-display-statistics/pom.xml
index 49e5f4eba..ea3439530 100644
--- a/extensions/guacamole-display-statistics/pom.xml
+++ b/extensions/guacamole-display-statistics/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-display-statistics</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-display-statistics</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <build>
diff --git a/extensions/guacamole-history-recording-storage/pom.xml b/extensions/guacamole-history-recording-storage/pom.xml
index 7ecb1bf8d..4793b159f 100644
--- a/extensions/guacamole-history-recording-storage/pom.xml
+++ b/extensions/guacamole-history-recording-storage/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-history-recording-storage</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-history-recording-storage</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
@@ -43,8 +41,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
index c68ef5c19..a1c9693b6 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
@@ -36,7 +36,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-vault</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Jackson for YAML support -->
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
index 4c7d89244..57a044941 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
@@ -36,7 +36,7 @@
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-vault</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-vault-ksm</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
    </dependencies>
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
index 36fe75a79..add25f85f 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
@@ -26,14 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-vault-ksm</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-vault-ksm</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-vault</artifactId>
-        <version>1.6.1</version>
+        <version>${revision}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -47,14 +46,13 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole base key vault support -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-vault-base</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <dependency>
diff --git a/extensions/guacamole-vault/pom.xml b/extensions/guacamole-vault/pom.xml
index c8f43cc8f..14313ff7a 100644
--- a/extensions/guacamole-vault/pom.xml
+++ b/extensions/guacamole-vault/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-vault</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
     <name>guacamole-vault</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <modules>
@@ -50,18 +48,4 @@
 
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- Guacamole Extension API -->
-            <dependency>
-                <groupId>org.apache.guacamole</groupId>
-                <artifactId>guacamole-ext</artifactId>
-                <version>1.6.1</version>
-                <scope>provided</scope>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
 </project>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 7f1105a0e..b4fd39e27 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>extensions</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
     <name>extensions</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-client</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <modules>
@@ -134,6 +132,20 @@
         
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- Guacamole Extension API -->
+            <dependency>
+                <groupId>org.apache.guacamole</groupId>
+                <artifactId>guacamole-ext</artifactId>
+                <version>${revision}</version>
+                <scope>provided</scope>
+            </dependency>
+        
+        </dependencies>
+    </dependencyManagement>
+
     <profiles>
 
         <!-- Build extensions with LGPL-licensed dependencies only if explicitly requested -->
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index f57834fc5..1a9ac5d5f 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-common-js</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
     <name>guacamole-common-js</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-client</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <properties>
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index 793a1ba28..e95807356 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-common</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-common</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-client</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <description>
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index 96eb16f49..2ab2ae2d7 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-ext</artifactId>
     <packaging>jar</packaging>
-    <version>1.6.1</version>
     <name>guacamole-ext</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-client</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <description>
@@ -87,8 +85,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
-            <version>1.6.1</version>
-            <scope>compile</scope>
+            <version>${revision}</version>
         </dependency>
 
         <!-- JUnit -->
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 6cf75842c..ebad2b889 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -26,15 +26,13 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole</artifactId>
     <packaging>war</packaging>
-    <version>1.6.1</version>
     <name>guacamole</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-client</artifactId>
-        <version>1.6.1</version>
-        <relativePath>../</relativePath>
+        <version>${revision}</version>
     </parent>
 
     <description>
@@ -254,14 +252,14 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
         </dependency>
 
         <!-- Guacamole JavaScript API -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
-            <version>1.6.1</version>
+            <version>${revision}</version>
             <type>zip</type>
             <scope>runtime</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index ca7eb5923..819161dd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-client</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1</version>
+    <version>${revision}</version>
     <name>guacamole-client</name>
     <url>http://guacamole.apache.org/</url>
 
@@ -35,6 +35,12 @@
         <!-- Core properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+        <!-- The Guacamole version for the entirety of guacamole-client (this is
+        referenced by this and all other pom.xml files within guacamole-client,
+        and is a special case within Maven as one of the few properties allowed
+        within the pom.xml version and intended for this purpose) -->
+        <revision>1.6.1</revision>
+
         <!-- Dependency versions -->
         <guava.version>32.1.3-jre</guava.version>
         <guice.version>5.1.0</guice.version>