Prepare to run on Java 19+

mojohaus · Mar 13, 2023 · f343158 · f343158
1 parent 797ccf7
commit f343158
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -26,9 +26,9 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
     with:
-      jdk-matrix: '["8", "11", "17"]'
+      jdk-matrix: '["8", "11", "17", "20-ea"]'
       jdk-distribution-matrix: '["temurin", "zulu"]'
-      ff-jdk: "8"
-      ff-maven: "3.8.7"                     # Maven version for fail-fast-build
+      ff-jdk: "11"
+      ff-maven: "3.9.0"                     # Maven version for fail-fast-build
       maven-matrix: '[ "3.2.5", "3.8.7" ]'  # Maven versions matrix for verify builds
 
diff --git a/animal-sniffer-maven-plugin/src/it/manimalsniffer-49/pom.xml b/animal-sniffer-maven-plugin/src/it/manimalsniffer-49/pom.xml
@@ -42,7 +42,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.11.0</version>
           <configuration>
             <source>@mojo.java.target@</source>
             <target>@mojo.java.target@</target>
@@ -58,8 +58,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java b/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java
@@ -67,7 +67,7 @@ protected void process( String name, InputStream image )
         try
         {
             ClassReader cr = new ClassReader( image );
-            cr.accept( new ClassVisitor(Opcodes.ASM7)
+            cr.accept( new ClassVisitor(Opcodes.ASM9)
             {
                 public void visit( int version, int access, String name, String signature, String superName,
                                    String[] interfaces )

diff --git a/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureBuilder.java b/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureBuilder.java
@@ -198,9 +198,8 @@ private class SignatureVisitor
     {
         private Clazz clazz;
 
-        @SuppressWarnings("deprecation")
         public SignatureVisitor() {
-            super(Opcodes.ASM7);
+            super(Opcodes.ASM9);
         }
 
         public void visit( int version, int access, String name, String signature, String superName,

diff --git a/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java b/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java
@@ -294,7 +294,7 @@ private class CheckingVisitor
 
         public CheckingVisitor( String name )
         {
-            super(Opcodes.ASM7);
+            super(Opcodes.ASM9);
             this.ignoredPackageCache = new HashSet<>( 50 * ignoredPackageRules.size() );
             this.name = name;
         }
@@ -354,7 +354,7 @@ public AnnotationVisitor visitAnnotation(String desc, boolean visible)
 
         @Override
         public FieldVisitor visitField(int access, String name, final String descriptor, String signature, Object value) {
-            return new FieldVisitor(Opcodes.ASM7) {
+            return new FieldVisitor(Opcodes.ASM9) {
 
                 boolean ignoreError = ignoreClass;
 
@@ -385,7 +385,7 @@ public void visitEnd() {
         public MethodVisitor visitMethod( int access, final String name, final String desc, String signature, String[] exceptions )
         {
             line = 0;
-            return new MethodVisitor(Opcodes.ASM7)
+            return new MethodVisitor(Opcodes.ASM9)
             {
                 /**
                  * True if @IgnoreJRERequirement is set.

diff --git a/pom.xml b/pom.xml
@@ -134,13 +134,15 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
+          <version>3.5.0</version>
           <configuration>
             <projectsDirectory>src/it</projectsDirectory>
             <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
             <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
             <settingsFile>src/it/settings.xml</settingsFile>
             <showErrors>true</showErrors>
-            <streamLogs>true</streamLogs>
+            <streamLogs>false</streamLogs>
+            <streamLogsOnFailures>true</streamLogsOnFailures>
             <postBuildHookScript>verify</postBuildHookScript>
             <goals>
               <goal>verify</goal>