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

Merge pull request #166 from glyptodon/maven-warnings

Browse Source 
GUAC-1170: Fix all Maven warnings
This commit is contained in:
James Muehlner
2015-04-27 19:21:54 -07:00
parent b85da4b201 a0ba68fcaf
commit c899ace33f
15 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/guacamole-example/pom.xml
View File

@@ -36,6 +36,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration> <configuration>
<overlays> <overlays>
<overlay> <overlay>

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

@@ -38,25 +38,22 @@
</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.2-beta-5</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>
</plugin> </plugin>

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

@@ -38,25 +38,22 @@
</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.2-beta-5</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>
</plugin> </plugin>

2
extensions/guacamole-auth-jdbc/pom.xml
View File

@@ -32,7 +32,7 @@
<!-- Assembly plugin - for easy distribution --> <!-- Assembly plugin - for easy distribution -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version> <version>2.5.3</version>
<inherited>false</inherited> <inherited>false</inherited>
<executions> <executions>
<execution> <execution>

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

@@ -16,12 +16,12 @@
<!-- MySQL implementation --> <!-- MySQL implementation -->
<fileSet> <fileSet>
<outputDirectory>/mysql/schema</outputDirectory> <outputDirectory>mysql/schema</outputDirectory>
<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>
</includes> </includes>
@@ -29,12 +29,12 @@
<!-- PostgreSQL implementation --> <!-- PostgreSQL implementation -->
<fileSet> <fileSet>
<outputDirectory>/postgresql/schema</outputDirectory> <outputDirectory>postgresql/schema</outputDirectory>
<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>
</includes> </includes>

2
extensions/guacamole-auth-ldap/pom.xml
View File

@@ -35,7 +35,7 @@
<!-- Assembly plugin - for easy distribution --> <!-- Assembly plugin - for easy distribution -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version> <version>2.5.3</version>
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}</finalName> <finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>

5
extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
View File

@@ -16,13 +16,12 @@
<!-- Include docs --> <!-- Include docs -->
<fileSet> <fileSet>
<outputDirectory>/</outputDirectory>
<directory>doc</directory> <directory>doc</directory>
</fileSet> </fileSet>
<!-- Include schema --> <!-- Include schema -->
<fileSet> <fileSet>
<outputDirectory>/schema</outputDirectory> <outputDirectory>schema</outputDirectory>
<directory>schema</directory> <directory>schema</directory>
</fileSet> </fileSet>
@@ -33,7 +32,7 @@
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>/lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<scope>runtime</scope> <scope>runtime</scope>
<unpack>false</unpack> <unpack>false</unpack>
<useProjectArtifact>true</useProjectArtifact> <useProjectArtifact>true</useProjectArtifact>

2
extensions/guacamole-auth-noauth/pom.xml
View File

@@ -35,7 +35,7 @@
<!-- Assembly plugin - for easy distribution --> <!-- Assembly plugin - for easy distribution -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version> <version>2.5.3</version>
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}</finalName> <finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>

11
extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
View File

@@ -14,11 +14,10 @@
<!-- Include docs and schema --> <!-- Include docs and schema -->
<fileSets> <fileSets>
<!-- Include docs --> <!-- Include docs -->
<fileSet> <fileSet>
<outputDirectory>/</outputDirectory> <directory>doc</directory>
<directory>doc</directory> </fileSet>
</fileSet>
</fileSets> </fileSets>
@@ -27,7 +26,7 @@
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>/lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<scope>runtime</scope> <scope>runtime</scope>
<unpack>false</unpack> <unpack>false</unpack>
<useProjectArtifact>true</useProjectArtifact> <useProjectArtifact>true</useProjectArtifact>

2
guacamole-common-js/pom.xml
View File

@@ -54,7 +54,7 @@
<!-- Assemble JS files into single .zip --> <!-- Assemble JS files into single .zip -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version> <version>2.5.3</version>
<configuration> <configuration>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<descriptors> <descriptors>

2
guacamole-common/pom.xml
View File

@@ -70,6 +70,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
@@ -84,6 +85,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration> <configuration>
<detectOfflineLinks>false</detectOfflineLinks> <detectOfflineLinks>false</detectOfflineLinks>
</configuration> </configuration>

2
guacamole-ext/pom.xml
View File

@@ -70,6 +70,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
@@ -84,6 +85,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration> <configuration>
<detectOfflineLinks>false</detectOfflineLinks> <detectOfflineLinks>false</detectOfflineLinks>
</configuration> </configuration>

1
guacamole/pom.xml
View File

@@ -69,6 +69,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration> <configuration>
<!-- Filter translation strings --> <!-- Filter translation strings -->

3
pom.xml
View File

@@ -40,12 +40,13 @@
<!-- Assembly plugin - for easy distribution --> <!-- Assembly plugin - for easy distribution -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version> <version>2.5.3</version>
<!-- Build project archive --> <!-- Build project archive -->
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}</finalName> <finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors> <descriptors>
<descriptor>project-assembly.xml</descriptor> <descriptor>project-assembly.xml</descriptor>
</descriptors> </descriptors>

1
project-assembly.xml
View File

@@ -12,7 +12,6 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.basedir}</directory> <directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes> <useDefaultExcludes>true</useDefaultExcludes>
<excludes> <excludes>
<exclude>**/*.log</exclude> <exclude>**/*.log</exclude>