Skip to content

Pass tests with Java 22 and 23 #401

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

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Pass tests with Java 22 and 23 #401

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...orprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ protected int expectedWarnings() {
String javaVersion = getJavaVersion();
if (javaVersion.startsWith("1.8")) {
return 1;
} else if (javaVersion.contains("18") || javaVersion.contains("19") || javaVersion.contains("20")) {
} else if (javaVersion.contains("18")
|| javaVersion.contains("19")
|| javaVersion.contains("20")
|| javaVersion.contains("23")) {
return 5;
} else if (javaVersion.contains("21")) {
} else if (javaVersion.contains("21") || javaVersion.contains("22")) {
return 6;
}
return 2;
Expand Down
24 changes: 21 additions & 3 deletions ...ler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ protected int expectedErrors() {
|| javaVersion.contains("18")
|| javaVersion.contains("19")
|| javaVersion.contains("20")
|| javaVersion.contains("21")) {
|| javaVersion.contains("21")
|| javaVersion.contains("22")
|| javaVersion.contains("23")) {
return 5;
}
// javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence,
Expand All @@ -92,7 +94,9 @@ protected int expectedWarnings() {
|| javaVersion.contains("18")
|| javaVersion.contains("19")
|| javaVersion.contains("20")
|| javaVersion.contains("21")) {
|| javaVersion.contains("21")
|| javaVersion.contains("22")
|| javaVersion.contains("23")) {
return 1;
}
if (javaVersion.contains("1.8")) {
Expand Down Expand Up @@ -141,6 +145,12 @@ public String getTargetVersion() {
if (javaVersion.contains("21")) {
return "21";
}
if (javaVersion.contains("22")) {
return "22";
}
if (javaVersion.contains("23")) {
return "23";
}
return super.getTargetVersion();
}

Expand Down Expand Up @@ -177,6 +187,12 @@ public String getSourceVersion() {
if (javaVersion.contains("21")) {
return "21";
}
if (javaVersion.contains("22")) {
return "22";
}
if (javaVersion.contains("23")) {
return "23";
}
return super.getTargetVersion();
}

Expand All @@ -192,7 +208,9 @@ protected Collection<String> expectedOutputFiles() {
|| javaVersion.contains("18")
|| javaVersion.contains("19")
|| javaVersion.contains("20")
|| javaVersion.contains("21")) {
|| javaVersion.contains("21")
|| javaVersion.contains("22")
|| javaVersion.contains("23")) {
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
Expand Down
4 changes: 3 additions & 1 deletion ...mpiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest {
@Override
protected int expectedWarnings() {
String javaVersion = getJavaVersion();
if (javaVersion.contains("21")) {
if (javaVersion.contains("21") || javaVersion.contains("22")) {
return 8;
} else if (javaVersion.contains("23")) {
return 1;
} else {
return super.expectedWarnings();
}
Expand Down