Skip to content

Add support to run its with Java 20 #277

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
Apr 10, 2023
Merged

Add support to run its with Java 20 #277

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
14 changes: 7 additions & 7 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
with:
jdk-fast-fail-build: '11'
jdk-matrix: '["11", "17"]'
jdk-matrix: '["11", "17", "20"]'
jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica","corretto"]'
os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]'
# matrix-exclude: '[
# { "jdk": "21-ea", "distribution": "corretto" },
# { "jdk": "21-ea", "distribution": "liberica" },
# { "jdk": "21-ea", "distribution": "microsoft" },
# { "jdk": "21-ea", "distribution": "temurin" }
# ]'
matrix-exclude: '[
{ "jdk": "21-ea", "distribution": "corretto" },
{ "jdk": "21-ea", "distribution": "liberica" },
{ "jdk": "20", "distribution": "microsoft" },
{ "jdk": "21-ea", "distribution": "temurin" }
]'
maven_args: 'install javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'

5 changes: 3 additions & 2 deletions plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ def logFile = new File( basedir, 'build.log' )
assert logFile.exists()
content = logFile.text.normalize()

assert content.contains( "Tests run: 2, Failures: 0, Errors: 0, Skipped: 0" )

def junitLog = """Running org.acme.ApplicationTest
call(String org.acme.Application.greet(String))
execution(String org.acme.Application.greet(String))
Expand All @@ -28,7 +30,6 @@ call(void org.acme.Application.main(String[]))
execution(void org.acme.Application.main(String[]))
Running application
execution(String org.acme.Application.greet(String))
call(void org.junit.Assert.assertTrue(boolean))
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0""".normalize()
call(void org.junit.Assert.assertTrue(boolean))""".normalize()

assert content.contains( junitLog )
12 changes: 9 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 @@ -69,7 +69,7 @@ protected int expectedErrors()
String javaVersion = getJavaVersion();
if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
javaVersion.contains("18")||javaVersion.contains("19")){
javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")){
return 5;
}
// javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence, not one.
Expand All @@ -89,7 +89,7 @@ protected int expectedWarnings()
String javaVersion = getJavaVersion();
if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
javaVersion.contains("18")||javaVersion.contains("19")){
javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")){
return 1;
}
if (javaVersion.contains("1.8")){
Expand Down Expand Up @@ -134,6 +134,9 @@ public String getTargetVersion()
if (javaVersion.contains("19")){
return "19";
}
if (javaVersion.contains("20")){
return "20";
}
return super.getTargetVersion();
}

Expand Down Expand Up @@ -169,6 +172,9 @@ public String getSourceVersion()
if (javaVersion.contains("19")){
return "19";
}
if (javaVersion.contains("20")){
return "20";
}
return super.getTargetVersion();
}

Expand All @@ -178,7 +184,7 @@ protected Collection<String> expectedOutputFiles()
String javaVersion = getJavaVersion();
if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
javaVersion.contains("18")||javaVersion.contains("19")
javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")
){
return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class",
"org/codehaus/foo/Person.class" );
Expand Down