Skip to content

Commit f343158

Browse files
committed
Prepare to run on Java 19+
1 parent 797ccf7 commit f343158

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
name: Verify
2727
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
2828
with:
29-
jdk-matrix: '["8", "11", "17"]'
29+
jdk-matrix: '["8", "11", "17", "20-ea"]'
3030
jdk-distribution-matrix: '["temurin", "zulu"]'
31-
ff-jdk: "8"
32-
ff-maven: "3.8.7" # Maven version for fail-fast-build
31+
ff-jdk: "11"
32+
ff-maven: "3.9.0" # Maven version for fail-fast-build
3333
maven-matrix: '[ "3.2.5", "3.8.7" ]' # Maven versions matrix for verify builds
3434

animal-sniffer-maven-plugin/src/it/manimalsniffer-49/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</plugin>
4343
<plugin>
4444
<artifactId>maven-compiler-plugin</artifactId>
45-
<version>3.8.1</version>
45+
<version>3.11.0</version>
4646
<configuration>
4747
<source>@mojo.java.target@</source>
4848
<target>@mojo.java.target@</target>
@@ -58,8 +58,8 @@
5858
<plugin>
5959
<artifactId>maven-compiler-plugin</artifactId>
6060
<configuration>
61-
<source>1.6</source>
62-
<target>1.6</target>
61+
<source>8</source>
62+
<target>8</target>
6363
</configuration>
6464
</plugin>
6565
<plugin>

animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected void process( String name, InputStream image )
6767
try
6868
{
6969
ClassReader cr = new ClassReader( image );
70-
cr.accept( new ClassVisitor(Opcodes.ASM7)
70+
cr.accept( new ClassVisitor(Opcodes.ASM9)
7171
{
7272
public void visit( int version, int access, String name, String signature, String superName,
7373
String[] interfaces )

animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,8 @@ private class SignatureVisitor
198198
{
199199
private Clazz clazz;
200200

201-
@SuppressWarnings("deprecation")
202201
public SignatureVisitor() {
203-
super(Opcodes.ASM7);
202+
super(Opcodes.ASM9);
204203
}
205204

206205
public void visit( int version, int access, String name, String signature, String superName,

animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ private class CheckingVisitor
294294

295295
public CheckingVisitor( String name )
296296
{
297-
super(Opcodes.ASM7);
297+
super(Opcodes.ASM9);
298298
this.ignoredPackageCache = new HashSet<>( 50 * ignoredPackageRules.size() );
299299
this.name = name;
300300
}
@@ -354,7 +354,7 @@ public AnnotationVisitor visitAnnotation(String desc, boolean visible)
354354

355355
@Override
356356
public FieldVisitor visitField(int access, String name, final String descriptor, String signature, Object value) {
357-
return new FieldVisitor(Opcodes.ASM7) {
357+
return new FieldVisitor(Opcodes.ASM9) {
358358

359359
boolean ignoreError = ignoreClass;
360360

@@ -385,7 +385,7 @@ public void visitEnd() {
385385
public MethodVisitor visitMethod( int access, final String name, final String desc, String signature, String[] exceptions )
386386
{
387387
line = 0;
388-
return new MethodVisitor(Opcodes.ASM7)
388+
return new MethodVisitor(Opcodes.ASM9)
389389
{
390390
/**
391391
* True if @IgnoreJRERequirement is set.

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,15 @@
134134
<plugin>
135135
<groupId>org.apache.maven.plugins</groupId>
136136
<artifactId>maven-invoker-plugin</artifactId>
137+
<version>3.5.0</version>
137138
<configuration>
138139
<projectsDirectory>src/it</projectsDirectory>
139140
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
140141
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
141142
<settingsFile>src/it/settings.xml</settingsFile>
142143
<showErrors>true</showErrors>
143-
<streamLogs>true</streamLogs>
144+
<streamLogs>false</streamLogs>
145+
<streamLogsOnFailures>true</streamLogsOnFailures>
144146
<postBuildHookScript>verify</postBuildHookScript>
145147
<goals>
146148
<goal>verify</goal>

0 commit comments

Comments
 (0)