Skip to content

Commit e984367

Browse files
committed
Add support to run its with Java 20
1 parent 540be03 commit e984367

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.github/workflows/maven.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
2828
with:
2929
jdk-fast-fail-build: '11'
30-
jdk-matrix: '["11", "17"]'
30+
jdk-matrix: '["11", "17", "20"]'
3131
jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica","corretto"]'
3232
os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]'
33-
# matrix-exclude: '[
34-
# { "jdk": "21-ea", "distribution": "corretto" },
35-
# { "jdk": "21-ea", "distribution": "liberica" },
36-
# { "jdk": "21-ea", "distribution": "microsoft" },
37-
# { "jdk": "21-ea", "distribution": "temurin" }
38-
# ]'
33+
matrix-exclude: '[
34+
{ "jdk": "21-ea", "distribution": "corretto" },
35+
{ "jdk": "21-ea", "distribution": "liberica" },
36+
{ "jdk": "20", "distribution": "microsoft" },
37+
{ "jdk": "21-ea", "distribution": "temurin" }
38+
]'
3939
maven_args: 'install javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'
4040

plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ def logFile = new File( basedir, 'build.log' )
2020
assert logFile.exists()
2121
content = logFile.text.normalize()
2222

23+
assert content.contains( "Tests run: 2, Failures: 0, Errors: 0, Skipped: 0" )
24+
2325
def junitLog = """Running org.acme.ApplicationTest
2426
call(String org.acme.Application.greet(String))
2527
execution(String org.acme.Application.greet(String))
@@ -28,7 +30,6 @@ call(void org.acme.Application.main(String[]))
2830
execution(void org.acme.Application.main(String[]))
2931
Running application
3032
execution(String org.acme.Application.greet(String))
31-
call(void org.junit.Assert.assertTrue(boolean))
32-
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0""".normalize()
33+
call(void org.junit.Assert.assertTrue(boolean))""".normalize()
3334

3435
assert content.contains( junitLog )

plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected int expectedErrors()
6969
String javaVersion = getJavaVersion();
7070
if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
7171
javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
72-
javaVersion.contains("18")||javaVersion.contains("19")){
72+
javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")){
7373
return 5;
7474
}
7575
// javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence, not one.
@@ -89,7 +89,7 @@ protected int expectedWarnings()
8989
String javaVersion = getJavaVersion();
9090
if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
9191
javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
92-
javaVersion.contains("18")||javaVersion.contains("19")){
92+
javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")){
9393
return 1;
9494
}
9595
if (javaVersion.contains("1.8")){
@@ -134,6 +134,9 @@ public String getTargetVersion()
134134
if (javaVersion.contains("19")){
135135
return "19";
136136
}
137+
if (javaVersion.contains("20")){
138+
return "20";
139+
}
137140
return super.getTargetVersion();
138141
}
139142

@@ -169,6 +172,9 @@ public String getSourceVersion()
169172
if (javaVersion.contains("19")){
170173
return "19";
171174
}
175+
if (javaVersion.contains("20")){
176+
return "20";
177+
}
172178
return super.getTargetVersion();
173179
}
174180

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

0 commit comments

Comments
 (0)