Skip to content

Commit

Permalink
GUACAMOLE-1317: Update all Maven plugins to latest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike-jumper
mike-jumper committed Apr 2, 2021
1 parent 2468105 commit 7ce3882
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 83 deletions.
6 changes: 3 additions & 3 deletions doc/guacamole-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.3.1</version>
<configuration>
<overlays>
<overlay>
Expand All @@ -73,7 +73,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<version>0.13</version>

<!-- Bind RAT to validate phase -->
<executions>
Expand Down
4 changes: 2 additions & 2 deletions doc/guacamole-playback-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.3.1</version>
<configuration>
<overlays>
<overlay>
Expand All @@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<version>0.13</version>

<configuration>
<excludes>
Expand Down
5 changes: 2 additions & 3 deletions extensions/guacamole-auth-duo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<plugin>
<groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version>
<version>0.3.4</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand All @@ -67,9 +67,8 @@

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
3 changes: 1 addition & 2 deletions extensions/guacamole-auth-openid/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
3 changes: 1 addition & 2 deletions extensions/guacamole-auth-quickconnect/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
5 changes: 2 additions & 3 deletions extensions/guacamole-auth-radius/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<plugin>
<groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version>
<version>0.3.4</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand All @@ -63,9 +63,8 @@

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
5 changes: 2 additions & 3 deletions extensions/guacamole-auth-totp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<plugin>
<groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version>
<version>0.3.4</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand All @@ -63,9 +63,8 @@

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
6 changes: 2 additions & 4 deletions guacamole-common-js/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<!-- Assemble JS files into single .zip -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
Expand All @@ -77,17 +76,16 @@
<id>make-zip</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.6.1</version>
<executions>
<execution>
<id>default-minify</id>
Expand Down
25 changes: 1 addition & 24 deletions guacamole-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,37 +60,14 @@
<build>
<plugins>

<!-- Attach source jar -->
<!-- Attach source and JavaDoc .jars -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Attach JavaDoc jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<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>

</plugins>
Expand Down
25 changes: 1 addition & 24 deletions guacamole-ext/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,37 +60,14 @@
<build>
<plugins>

<!-- Attach source jar -->
<!-- Attach source and JavaDoc .jars -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Attach JavaDoc jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<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>

</plugins>
Expand Down
7 changes: 3 additions & 4 deletions guacamole/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.3.1</version>
<configuration>

<webResources>
Expand Down Expand Up @@ -123,7 +123,7 @@
<plugin>
<groupId>com.keithbranton.mojo</groupId>
<artifactId>angular-maven-plugin</artifactId>
<version>0.3.2</version>
<version>0.3.4</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand All @@ -142,9 +142,8 @@

<!-- JS/CSS Minification Plugin -->
<plugin>
<groupId>com.samaxes.maven</groupId>
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>1.7.5</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down
54 changes: 45 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,6 @@
<fork>true</fork>
</configuration>
</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
generation of LICENSE and NOTICE files -->
Expand All @@ -197,14 +190,57 @@
</executions>
</plugin>

<!-- Explicitly use latest version of Maven surefire plugin
(https://issues.apache.org/jira/browse/SUREFIRE-1588) -->
<!-- Use latest version of JavaScript/CSS minification plugin -->
<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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</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>
</pluginManagement>

Expand Down

0 comments on commit 7ce3882

Please sign in to comment.