Merge patch branch changes to main.

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.0</version>
     <name>guacamole-auth-ldap</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>extensions</artifactId>
-        <version>1.6.0</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.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Apache Directory LDAP API -->

extensions/guacamole-auth-ldap/src/main/resource-templates/guac-manifest.json

@@ -1,6 +1,6 @@
 {
 
-    "guacamoleVersion" : "1.6.0",
+    "guacamoleVersion" : "${project.version}",
 
     "name"      : "LDAP Authentication",
     "namespace" : "ldap",