Build with JDK 21

Author: ctubbsii

.gitattributes

@@ -0,0 +1,44 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Auto detect text files and perform LF normalization
+* text=auto eol=lf
+
+# Declare files with fixed line ending for tests.
+src/test/resources/**/* binary diff
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.github/workflows/maven.yaml

@@ -3,18 +3,21 @@
 
 name: mvn verify
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  contents: read
 
 jobs:
   build:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [17, 21]
-        include:
-          - { os: ubuntu-latest, verifyFormatOpt: '-Drevelc.verifyFormat' }
-          - { os: macos-latest, verifyFormatOpt: '-Drevelc.verifyFormat' }
-          - { os: windows-latest, verifyFormatOpt: '-Drevelc.skipFormat' }
+        java: [21]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -26,9 +29,9 @@ jobs:
         distribution: temurin
         cache: 'maven'
     - name: Download Maven Wrapper
-      run: mvn wrapper:wrapper "-Dmaven=3.9.8"
+      run: mvn wrapper:wrapper "-Dmaven=3.9.16"
     - name: Build with Maven
-      run: ./mvnw -B -V -e "-Dstyle.color=always" verify "-Drevelc.skipFormat" "${{ matrix.verifyFormatOpt }}"
+      run: ./mvnw -B -V -e "-Dstyle.color=always" verify "-Drevelc.skipFormat" "-Drevelc.verifyFormat"
       env:
         MAVEN_OPTS: -Djansi.force=true
     - name: View IT build log on failure

pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>net.revelc.code</groupId>
     <artifactId>revelc</artifactId>
-    <version>9</version>
+    <version>10</version>
   </parent>
   <artifactId>apilyzer-maven-plugin</artifactId>
   <version>1.3.1-SNAPSHOT</version>
@@ -47,7 +47,10 @@
   <properties>
     <formatter.configFile>src/build/eclipse-java-style.xml</formatter.configFile>
     <invoker.streamLogs>true</invoker.streamLogs>
-    <maven.compiler.release>8</maven.compiler.release>
+    <maven.compiler.release>11</maven.compiler.release>
+    <revelc.min-build-jdk>21</revelc.min-build-jdk>
+    <!-- plugin and dependency versions -->
+    <version.checkstyle>13.4.2</version.checkstyle>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -79,7 +82,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>13.4.0</version>
+            <version>${version.checkstyle}</version>
           </dependency>
         </dependencies>
         <executions>
@@ -91,6 +94,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>run-spotbugs</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

src/main/java/net/revelc/code/apilyzer/maven/plugin/AnalyzeMojo.java

@@ -14,10 +14,11 @@
 
 package net.revelc.code.apilyzer.maven.plugin;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.common.reflect.ClassPath;
 import com.google.common.reflect.ClassPath.ClassInfo;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.annotation.Annotation;
@@ -239,7 +240,7 @@ public class AnalyzeMojo extends AbstractMojo {
   private List<String> excludeAnnotations = Collections.emptyList();
   private PatternSet excludeAnnotationsPs;
 
-  private static final String FORMAT = "  %-20s %-60s %-35s %s\n";
+  private static final String FORMAT = "  %-20s %-60s %-35s %s%n";
 
   @Override
   public void execute() throws MojoFailureException, MojoExecutionException {
@@ -264,7 +265,7 @@ public void execute() throws MojoFailureException, MojoExecutionException {
       throw new MojoExecutionException("Error resolving project classpath", e);
     }
 
-    try (PrintStream out = new PrintStream(new File(outputFile))) {
+    try (PrintStream out = new PrintStream(new File(outputFile), UTF_8)) {
 
       out.println("Includes: " + includes);
       out.println("IncludeAnnotations: " + includeAnnotations);
@@ -314,7 +315,7 @@ public void execute() throws MojoFailureException, MojoExecutionException {
         getLog().error(msg);
         throw new MojoFailureException(msg);
       }
-    } catch (FileNotFoundException e) {
+    } catch (IOException e) {
       throw new MojoExecutionException("Bad configuration: cannot create specified outputFile", e);
     }
   }