Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare to run on Java 19+ #237

Merged
merged 1 commit into from
Mar 13, 2023
Merged

Prepare to run on Java 19+ #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

6 changes: 3 additions & 3 deletions animal-sniffer-maven-plugin/src/it/manimalsniffer-49/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassListBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
3 changes: 1 addition & 2 deletions animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/SignatureChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down