safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1170: Use maven-dependency-plugin instead of maven-assembly-plugin, when build artifact should really only be one .jar file.

Browse Source
This commit is contained in:
Michael Jumper
2015-04-26 23:42:53 -07:00
parent 4eadf19a91
commit a0ba68fcaf
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
View File

@@ -38,23 +38,20 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- Assembly plugin - for easy distribution --> <!-- Copy dependencies prior to packaging -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.5.3</version> <artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions> <executions>
<execution> <execution>
<id>jar-with-dependencies</id> <id>unpack-dependencies</id>
<phase>package</phase> <phase>prepare-package</phase>
<goals> <goals>
<goal>single</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>extension/${project.artifactId}-${project.version}</finalName> <outputDirectory>${project.build.directory}/classes</outputDirectory>
<appendAssemblyId>false</appendAssemblyId>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

19
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
View File

@@ -38,23 +38,20 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- Assembly plugin - for easy distribution --> <!-- Copy dependencies prior to packaging -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.5.3</version> <artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions> <executions>
<execution> <execution>
<id>jar-with-dependencies</id> <id>unpack-dependencies</id>
<phase>package</phase> <phase>prepare-package</phase>
<goals> <goals>
<goal>single</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>extension/${project.artifactId}-${project.version}</finalName> <outputDirectory>${project.build.directory}/classes</outputDirectory>
<appendAssemblyId>false</appendAssemblyId>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

4
extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
View File

@@ -20,7 +20,7 @@
<directory>modules/guacamole-auth-jdbc-mysql/schema</directory> <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>modules/guacamole-auth-jdbc-mysql/target/extension</directory> <directory>modules/guacamole-auth-jdbc-mysql/target</directory>
<outputDirectory>mysql</outputDirectory> <outputDirectory>mysql</outputDirectory>
<includes> <includes>
<include>*.jar</include> <include>*.jar</include>
@@ -33,7 +33,7 @@
<directory>modules/guacamole-auth-jdbc-postgresql/schema</directory> <directory>modules/guacamole-auth-jdbc-postgresql/schema</directory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>modules/guacamole-auth-jdbc-postgresql/target/extension</directory> <directory>modules/guacamole-auth-jdbc-postgresql/target</directory>
<outputDirectory>postgresql</outputDirectory> <outputDirectory>postgresql</outputDirectory>
<includes> <includes>
<include>*.jar</include> <include>*.jar</include>