deps: newer Maven plugin versions for Airlock (#1140)

* deps: newer Maven plugin versions for Airlock * Newer Javadoc version * checkstyle to profile * checkstyle.xml fix * allowUndeclaredRTE was removed * scope => accessModifiers * project-info-reports:dependencies changed site to reports
googleapis · Jan 24, 2025 · 11a8fca · 11a8fca
1 parent d79e42b
commit 11a8fca
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 81 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,6 +8,7 @@ jobs:
   units:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java: [8, 11, 17]
     steps:
@@ -22,6 +23,7 @@ jobs:
   dependencies:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java: [8, 11, 17]
     steps:

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -67,7 +67,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <!-- Checks for Javadoc comments.                     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
     <module name="JavadocMethod">
-      <property name="scope" value="protected"/>
+      <property name="accessModifiers" value="protected"/>
       <property name="severity" value="warning"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>

diff --git a/google-oauth-client-assembly/assembly.xml b/google-oauth-client-assembly/assembly.xml
@@ -64,38 +64,38 @@
     </file>
     <!-- dependencies.html files -->
     <file>
-      <source>../google-oauth-client/target/site/dependencies.html</source>
+      <source>../google-oauth-client/target/reports/dependencies.html</source>
       <destName>google-oauth-client-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-appengine/target/site/dependencies.html</source>
+      <source>../google-oauth-client-appengine/target/reports/dependencies.html</source>
       <destName>google-oauth-client-appengine-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-java6/target/site/dependencies.html</source>
+      <source>../google-oauth-client-java6/target/reports/dependencies.html</source>
       <destName>google-oauth-client-java6-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-jetty/target/site/dependencies.html</source>
+      <source>../google-oauth-client-jetty/target/reports/dependencies.html</source>
       <destName>google-oauth-client-jetty-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-servlet/target/site/dependencies.html</source>
+      <source>../google-oauth-client-servlet/target/reports/dependencies.html</source>
       <destName>google-oauth-client-servlet-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
   </files>
   <fileSets>
     <fileSet>
-      <directory>target/site/css</directory>
+      <directory>target/reports/css</directory>
       <outputDirectory>google-oauth-java-client/dependencies/css</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>target/site/images</directory>
+      <directory>target/reports/images</directory>
       <outputDirectory>google-oauth-java-client/dependencies/images</outputDirectory>
     </fileSet>
     <fileSet>

diff --git a/pom.xml b/pom.xml
@@ -225,7 +225,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.6.3</version>
+          <version>3.11.2</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>
@@ -234,6 +234,13 @@
               </goals>
             </execution>
           </executions>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-provider-api</artifactId>
+              <version>3.3.3</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -257,7 +264,14 @@
         </plugin>
         <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.6.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>10.21.1</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -272,17 +286,24 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.22</version>
+          <version>1.24</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.8.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.sonatype.plexus</groupId>
+              <artifactId>plexus-sec-dispatcher</artifactId>
+              <version>1.4</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.1</version>
+          <version>3.21.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -364,21 +385,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -441,6 +447,10 @@
             <phase>package</phase>
           </execution>
         </executions>
+        <configuration>
+          <!-- Helpful to see Airlock dependency resolutions -->
+          <skip>${mpir.skip}</skip>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>com.coveo</groupId>
@@ -487,9 +497,36 @@
     <project.datanucleus-maven-plugin.version>5.2.1</project.datanucleus-maven-plugin.version>
     <project.servlet-api.version>2.5</project.servlet-api.version>
     <deploy.autorelease>false</deploy.autorelease>
+    <mpir.skip>false</mpir.skip>
   </properties>
 
   <profiles>
+    <profile>
+      <id>checkstyle</id>
+      <activation>
+        <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <configuration>
+              <configLocation>checkstyle.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>release-sign-artifacts</id>
       <activation>
@@ -542,7 +579,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.3</version>
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>

diff --git a/samples/checkstyle.xml b/samples/checkstyle.xml
@@ -84,14 +84,10 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <!-- Checks for Javadoc comments.                     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
     <module name="JavadocMethod">
-      <property name="scope" value="protected"/>
+      <property name="accessModifiers" value="protected"/>
       <property name="severity" value="warning"/>
-      <property name="allowMissingJavadoc" value="true"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
-      <property name="allowThrowsTagsForSubclasses" value="true"/>
-      <property name="allowUndeclaredRTE" value="true"/>
     </module>
 
     <module name="JavadocType">
@@ -197,21 +193,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
     -->
 
-    <module name="LineLength">
-      <!-- Checks if a line is too long. -->
-      <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
-      <property name="severity" value="error"/>
-
-      <!--
-        The default ignore pattern exempts the following elements:
-          - import statements
-          - long URLs inside comments
-      -->
-
-      <property name="ignorePattern"
-          value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-          default="^(package .*;\s*)|(import .*;\s*)|( *\* *https?://.*)$"/>
-    </module>
 
     <module name="LeftCurly">
       <!-- Checks for placement of the left curly brace ('{'). -->
@@ -332,5 +313,21 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
 
   </module>
+
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
+    <property name="severity" value="error"/>
+
+    <!--
+      The default ignore pattern exempts the following elements:
+        - import statements
+        - long URLs inside comments
+    -->
+
+    <property name="ignorePattern"
+              value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+              default="^(package .*;\s*)|(import .*;\s*)|( *\* *https?://.*)$"/>
+  </module>
 </module>
 
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
@@ -33,22 +33,6 @@
           </systemProperties>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>false</failOnViolation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -102,6 +86,40 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <profiles>
+    <profile>
+      <id>checkstyle</id>
+      <activation>
+        <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>3.6.0</version>
+            <configuration>
+              <configLocation>../checkstyle.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <failOnViolation>false</failOnViolation>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>10.21.1</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <!-- By default, we release artifacts to Sonatype, which requires
           nexus-staging-maven-plugin. -->