From a0ba68fcafb46da9cf00bb4b7efad3ac12e7fd0b Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 26 Apr 2015 23:42:53 -0700
Subject: [PATCH] GUAC-1170: Use maven-dependency-plugin instead of
 maven-assembly-plugin, when build artifact should really only be one .jar
 file.

---
 .../modules/guacamole-auth-jdbc-mysql/pom.xml | 21 ++++++++-----------
 .../guacamole-auth-jdbc-postgresql/pom.xml    | 21 ++++++++-----------
 .../src/main/assembly/dist.xml                |  4 ++--
 3 files changed, 20 insertions(+), 26 deletions(-)

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 3e47aa6ba..436cb6ca3 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
@@ -38,25 +38,22 @@
                 </configuration>
             </plugin>
 
-            <!-- Assembly plugin - for easy distribution -->
+            <!-- Copy dependencies prior to packaging -->
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
                 <executions>
                     <execution>
-                        <id>jar-with-dependencies</id>
-                        <phase>package</phase>
+                        <id>unpack-dependencies</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <finalName>extension/${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
                         </configuration>
-                    </execution>                    
+                    </execution>
                 </executions>
             </plugin>
 
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 655a32b61..207348690 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
@@ -38,25 +38,22 @@
                 </configuration>
             </plugin>
 
-            <!-- Assembly plugin - for easy distribution -->
+            <!-- Copy dependencies prior to packaging -->
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
                 <executions>
                     <execution>
-                        <id>jar-with-dependencies</id>
-                        <phase>package</phase>
+                        <id>unpack-dependencies</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <finalName>extension/${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
                         </configuration>
-                    </execution>                    
+                    </execution>
                 </executions>
             </plugin>
 
diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
index 915b17d17..4e72cec1e 100644
--- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
@@ -20,7 +20,7 @@
                 <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
             </fileSet>
             <fileSet>
-                <directory>modules/guacamole-auth-jdbc-mysql/target/extension</directory>
+                <directory>modules/guacamole-auth-jdbc-mysql/target</directory>
                 <outputDirectory>mysql</outputDirectory>
                 <includes>
                     <include>*.jar</include>
@@ -33,7 +33,7 @@
                 <directory>modules/guacamole-auth-jdbc-postgresql/schema</directory>
             </fileSet>
             <fileSet>
-                <directory>modules/guacamole-auth-jdbc-postgresql/target/extension</directory>
+                <directory>modules/guacamole-auth-jdbc-postgresql/target</directory>
                 <outputDirectory>postgresql</outputDirectory>
                 <includes>
                     <include>*.jar</include>