From 1fceb6b53590b2756a7cdc5bf72e11499bc150e2 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 31 Mar 2021 16:43:00 -0700
Subject: [PATCH] GUACAMOLE-1298: Migrate generation of guacamole-auth-jdbc
 tarball to common dist.xml configuration.

---
 .../modules/guacamole-auth-jdbc-dist/pom.xml                   | 2 +-
 .../{project-assembly.xml => src/main/assembly/dist.xml}       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/{project-assembly.xml => src/main/assembly/dist.xml} (94%)

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 d78a14791..e67143ed6 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
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-jdbc-dist</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <name>guacamole-auth-jdbc-dist</name>
     <url>http://guacamole.apache.org/</url>
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/main/assembly/dist.xml
similarity index 94%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/main/assembly/dist.xml
index 210559511..0e61612a4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/main/assembly/dist.xml
@@ -36,6 +36,7 @@
         <!-- MySQL extension .jar -->
         <dependencySet>
             <outputDirectory>mysql</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
             <includes>
                 <include>org.apache.guacamole:guacamole-auth-jdbc-mysql</include>
             </includes>
@@ -44,6 +45,7 @@
         <!-- PostgreSQL extension .jar -->
         <dependencySet>
             <outputDirectory>postgresql</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
             <includes>
                 <include>org.apache.guacamole:guacamole-auth-jdbc-postgresql</include>
             </includes>
@@ -52,6 +54,7 @@
         <!-- SQL Server extension .jar -->
         <dependencySet>
             <outputDirectory>sqlserver</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
             <includes>
                 <include>org.apache.guacamole:guacamole-auth-jdbc-sqlserver</include>
             </includes>