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

GUACAMOLE-1317: Merge update all Maven plugins to latest.

Browse Source
This commit is contained in:
Virtually Nick
2021-04-02 15:50:52 -04:00
committed by GitHub
parent 24681059c3 7ce3882319
commit daea496631
12 changed files with 65 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
@@ -57,7 +57,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> <version>3.3.1</version>
<configuration> <configuration>
<overlays> <overlays>
<overlay> <overlay>
@@ -73,7 +73,7 @@
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<version>0.12</version> <version>0.13</version>
<!-- Bind RAT to validate phase --> <!-- Bind RAT to validate phase -->
<executions> <executions>

4
doc/guacamole-playback-example/pom.xml
View File

@@ -41,7 +41,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> <version>3.3.1</version>
<configuration> <configuration>
<overlays> <overlays>
<overlay> <overlay>
@@ -57,7 +57,7 @@
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<version>0.12</version> <version>0.13</version>
<configuration> <configuration>
<excludes> <excludes>

5
extensions/guacamole-auth-duo/pom.xml
View File

@@ -48,7 +48,7 @@
<plugin> <plugin>
<groupId>com.keithbranton.mojo</groupId> <groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId> <artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version> <version>0.3.4</version>
<executions> <executions>
<execution> <execution>
<phase>generate-resources</phase> <phase>generate-resources</phase>
@@ -67,9 +67,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>

3
extensions/guacamole-auth-openid/pom.xml
View File

@@ -42,9 +42,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>

3
extensions/guacamole-auth-quickconnect/pom.xml
View File

@@ -42,9 +42,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>

5
extensions/guacamole-auth-radius/pom.xml
View File

@@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>com.keithbranton.mojo</groupId> <groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId> <artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version> <version>0.3.4</version>
<executions> <executions>
<execution> <execution>
<phase>generate-resources</phase> <phase>generate-resources</phase>
@@ -63,9 +63,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>

5
extensions/guacamole-auth-totp/pom.xml
View File

@@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>com.keithbranton.mojo</groupId> <groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId> <artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version> <version>0.3.4</version>
<executions> <executions>
<execution> <execution>
<phase>generate-resources</phase> <phase>generate-resources</phase>
@@ -63,9 +63,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>

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

@@ -65,7 +65,6 @@
<!-- 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.5.3</version>
<configuration> <configuration>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<descriptors> <descriptors>
@@ -77,7 +76,7 @@
<id>make-zip</id> <id>make-zip</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attached</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
@@ -85,9 +84,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.6.1</version>
<executions> <executions>
<execution> <execution>
<id>default-minify</id> <id>default-minify</id>

25
guacamole-common/pom.xml
View File

@@ -60,37 +60,14 @@
<build> <build>
<plugins> <plugins>
<!-- Attach source jar --> <!-- Attach source and JavaDoc .jars -->
<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>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<!-- Attach JavaDoc jar -->
<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>
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>

25
guacamole-ext/pom.xml
View File

@@ -60,37 +60,14 @@
<build> <build>
<plugins> <plugins>
<!-- Attach source jar --> <!-- Attach source and JavaDoc .jars -->
<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>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<!-- Attach JavaDoc jar -->
<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>
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>

7
guacamole/pom.xml
View File

@@ -75,7 +75,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> <version>3.3.1</version>
<configuration> <configuration>
<webResources> <webResources>
@@ -123,7 +123,7 @@
<plugin> <plugin>
<groupId>com.keithbranton.mojo</groupId> <groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId> <artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version> <version>0.3.4</version>
<executions> <executions>
<execution> <execution>
<phase>generate-resources</phase> <phase>generate-resources</phase>
@@ -142,9 +142,8 @@
<!-- JS/CSS Minification Plugin --> <!-- JS/CSS Minification Plugin -->
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>

54
pom.xml
View File

@@ -164,13 +164,6 @@
<fork>true</fork> <fork>true</fork>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
</configuration>
</plugin>
<!-- Provide "generate-license-files" execution for automatic <!-- Provide "generate-license-files" execution for automatic
generation of LICENSE and NOTICE files --> generation of LICENSE and NOTICE files -->
@@ -197,14 +190,57 @@
</executions> </executions>
</plugin> </plugin>
<!-- Explicitly use latest version of Maven surefire plugin <!-- Use latest version of JavaScript/CSS minification plugin -->
(https://issues.apache.org/jira/browse/SUREFIRE-1588) --> <plugin>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>2.0.1</version>
</plugin>
<!-- Explicitly use latest versions of core plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version> <version>3.0.0-M5</version>
</plugin> </plugin>
<!-- Provide default configurations for attaching JavaDoc and source -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<detectOfflineLinks>false</detectOfflineLinks>
<source>8</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>