Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 80e9ca4

Browse files
slachiewiczslachiewicz
committedApr 5, 2025·
Include JDK 24 in CI
1 parent e6d3c30 commit 80e9ca4

File tree

8 files changed

+41
-64
lines changed

8 files changed

+41
-64
lines changed
 

‎plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

‎plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ protected File getLocalArtifactPath(String groupId, String artifactId, String ve
305305
}
306306

307307
protected String getJavaVersion() {
308-
309308
String javaVersion = System.getProperty("java.version");
310309
String realJavaVersion = javaVersion;
311310

‎plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected Collection<String> expectedOutputFiles() {
4141
|| javaVersion.contains("11")
4242
|| javaVersion.contains("17")
4343
|| javaVersion.contains("21")
44-
|| javaVersion.contains("23")) {
44+
|| javaVersion.contains("24")) {
4545
return Arrays.asList(
4646
"org/codehaus/foo/Deprecation.class",
4747
"org/codehaus/foo/ExternalDeps.class",

‎plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected Collection<String> expectedOutputFiles() {
3434
|| javaVersion.contains("11")
3535
|| javaVersion.contains("17")
3636
|| javaVersion.contains("21")
37-
|| javaVersion.contains("23")) {
37+
|| javaVersion.contains("24")) {
3838
return Arrays.asList(
3939
"org/codehaus/foo/Deprecation.class",
4040
"org/codehaus/foo/ExternalDeps.class",

‎plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected Collection<String> expectedOutputFiles() {
6868
|| javaVersion.contains("11")
6969
|| javaVersion.contains("17")
7070
|| javaVersion.contains("21")
71-
|| javaVersion.contains("23")) {
71+
|| javaVersion.contains("24")) {
7272
return Arrays.asList(
7373
"org/codehaus/foo/Deprecation.class",
7474
"org/codehaus/foo/ExternalDeps.class",

‎plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ protected int expectedWarnings() {
2222
|| javaVersion.contains("20")
2323
|| javaVersion.contains("21")
2424
|| javaVersion.contains("22")
25-
|| javaVersion.contains("23")) {
25+
|| javaVersion.contains("23")
26+
|| javaVersion.contains("24")) {
2627
return 5;
2728
}
2829
return 2;

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

Lines changed: 32 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,10 @@ protected String getRoleHint() {
5959
@Override
6060
protected int expectedErrors() {
6161
String javaVersion = getJavaVersion();
62-
if (javaVersion.contains("9.0")
63-
|| javaVersion.contains("11")
64-
|| javaVersion.contains("14")
65-
|| javaVersion.contains("15")
66-
|| javaVersion.contains("16")
62+
if (javaVersion.contains("11")
6763
|| javaVersion.contains("17")
68-
|| javaVersion.contains("18")
69-
|| javaVersion.contains("19")
70-
|| javaVersion.contains("20")
7164
|| javaVersion.contains("21")
72-
|| javaVersion.contains("22")
73-
|| javaVersion.contains("23")) {
65+
|| javaVersion.contains("24")) {
7466
return 5;
7567
}
7668
// javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence,
@@ -96,7 +88,8 @@ protected int expectedWarnings() {
9688
|| javaVersion.contains("20")
9789
|| javaVersion.contains("21")
9890
|| javaVersion.contains("22")
99-
|| javaVersion.contains("23")) {
91+
|| javaVersion.contains("23")
92+
|| javaVersion.contains("24")) {
10093
return 1;
10194
}
10295
if (javaVersion.contains("1.8")) {
@@ -117,39 +110,30 @@ public String getTargetVersion() {
117110
String javaVersion = getJavaVersion();
118111
if (javaVersion.contains("9.0")) {
119112
return "1.7";
120-
}
121-
if (javaVersion.contains("11")) {
113+
} else if (javaVersion.contains("11")) {
122114
return "11";
123-
}
124-
if (javaVersion.contains("14")) {
115+
} else if (javaVersion.contains("14")) {
125116
return "14";
126-
}
127-
if (javaVersion.contains("15")) {
117+
} else if (javaVersion.contains("15")) {
128118
return "15";
129-
}
130-
if (javaVersion.contains("16")) {
119+
} else if (javaVersion.contains("16")) {
131120
return "16";
132-
}
133-
if (javaVersion.contains("17")) {
121+
} else if (javaVersion.contains("17")) {
134122
return "17";
135-
}
136-
if (javaVersion.contains("18")) {
123+
} else if (javaVersion.contains("18")) {
137124
return "18";
138-
}
139-
if (javaVersion.contains("19")) {
125+
} else if (javaVersion.contains("19")) {
140126
return "19";
141-
}
142-
if (javaVersion.contains("20")) {
127+
} else if (javaVersion.contains("20")) {
143128
return "20";
144-
}
145-
if (javaVersion.contains("21")) {
129+
} else if (javaVersion.contains("21")) {
146130
return "21";
147-
}
148-
if (javaVersion.contains("22")) {
131+
} else if (javaVersion.contains("22")) {
149132
return "22";
150-
}
151-
if (javaVersion.contains("23")) {
133+
} else if (javaVersion.contains("23")) {
152134
return "23";
135+
} else if (javaVersion.contains("24")) {
136+
return "24";
153137
}
154138
return super.getTargetVersion();
155139
}
@@ -159,39 +143,30 @@ public String getSourceVersion() {
159143
String javaVersion = getJavaVersion();
160144
if (javaVersion.contains("9.0")) {
161145
return "1.7";
162-
}
163-
if (javaVersion.contains("11")) {
146+
} else if (javaVersion.contains("11")) {
164147
return "11";
165-
}
166-
if (javaVersion.contains("14")) {
148+
} else if (javaVersion.contains("14")) {
167149
return "14";
168-
}
169-
if (javaVersion.contains("15")) {
150+
} else if (javaVersion.contains("15")) {
170151
return "15";
171-
}
172-
if (javaVersion.contains("16")) {
152+
} else if (javaVersion.contains("16")) {
173153
return "16";
174-
}
175-
if (javaVersion.contains("17")) {
154+
} else if (javaVersion.contains("17")) {
176155
return "17";
177-
}
178-
if (javaVersion.contains("18")) {
156+
} else if (javaVersion.contains("18")) {
179157
return "18";
180-
}
181-
if (javaVersion.contains("19")) {
158+
} else if (javaVersion.contains("19")) {
182159
return "19";
183-
}
184-
if (javaVersion.contains("20")) {
160+
} else if (javaVersion.contains("20")) {
185161
return "20";
186-
}
187-
if (javaVersion.contains("21")) {
162+
} else if (javaVersion.contains("21")) {
188163
return "21";
189-
}
190-
if (javaVersion.contains("22")) {
164+
} else if (javaVersion.contains("22")) {
191165
return "22";
192-
}
193-
if (javaVersion.contains("23")) {
166+
} else if (javaVersion.contains("23")) {
194167
return "23";
168+
} else if (javaVersion.contains("24")) {
169+
return "24";
195170
}
196171
return super.getTargetVersion();
197172
}
@@ -210,7 +185,8 @@ protected Collection<String> expectedOutputFiles() {
210185
|| javaVersion.contains("20")
211186
|| javaVersion.contains("21")
212187
|| javaVersion.contains("22")
213-
|| javaVersion.contains("23")) {
188+
|| javaVersion.contains("23")
189+
|| javaVersion.contains("24")) {
214190
return Arrays.asList(
215191
"org/codehaus/foo/Deprecation.class",
216192
"org/codehaus/foo/ExternalDeps.class",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest {
2727
@Override
2828
protected int expectedWarnings() {
2929
String javaVersion = getJavaVersion();
30-
if (javaVersion.contains("21") || javaVersion.contains("22") || javaVersion.contains("23")) {
30+
if (javaVersion.contains("21")
31+
|| javaVersion.contains("24")) {
3132
return 1;
3233
} else {
3334
return super.expectedWarnings();

0 commit comments

Comments
 (0)
Please sign in to comment.