Skip to content

Commit 6950ab9

Browse files
Bump org.eclipse.jdt:ecj from 3.38.0 to 3.40.0 (#422)
Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.38.0 to 3.40.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylwester Lachiewicz <[email protected]>
1 parent 7cc5d40 commit 6950ab9

File tree

5 files changed

+42
-14
lines changed

5 files changed

+42
-14
lines changed

plexus-compilers/plexus-compiler-eclipse/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.eclipse.jdt</groupId>
2727
<artifactId>ecj</artifactId>
28-
<version>3.38.0</version>
28+
<version>3.40.0</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>javax.inject</groupId>

plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ public CompilerResult performCompile(CompilerConfiguration config) throws Compil
234234
getLog().debug("Using JSR-199 EclipseCompiler");
235235
// ECJ JSR-199 compiles against the latest Java version it supports if no source
236236
// version is given explicitly. BatchCompiler uses 1.3 as default. So check
237-
// whether a source version is specified, and if not supply 1.3 explicitly.
237+
// whether a source version is specified, and if not supply 8 explicitly.
238238
if (!haveSourceOrReleaseArgument(args)) {
239-
getLog().debug("ecj: no source level nor release specified, defaulting to Java 1.3");
239+
getLog().debug("ecj: no source level nor release specified, defaulting to Java 8");
240240
args.add("-source");
241-
args.add("1.3");
241+
args.add("8");
242242
}
243243

244244
// Also check for the encoding. Could have been set via the CompilerConfig

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

+12-6
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,21 @@ protected int expectedWarnings() {
3636

3737
@Override
3838
protected Collection<String> expectedOutputFiles() {
39+
String javaVersion = getJavaVersion();
40+
if (javaVersion.contains("9.0")
41+
|| javaVersion.contains("11")
42+
|| javaVersion.contains("17")
43+
|| javaVersion.contains("21")
44+
|| javaVersion.contains("23")) {
45+
return Arrays.asList(
46+
"org/codehaus/foo/Deprecation.class",
47+
"org/codehaus/foo/ExternalDeps.class",
48+
"org/codehaus/foo/Person.class");
49+
}
3950
return Arrays.asList(
4051
"org/codehaus/foo/Deprecation.class",
4152
"org/codehaus/foo/ExternalDeps.class",
4253
"org/codehaus/foo/Person.class",
43-
"org/codehaus/foo/ReservedWord.class"
44-
// "org/codehaus/foo/Bad.class", // This one has no class file generated as it's one big
45-
// issue
46-
// "org/codehaus/foo/UnknownSymbol.class",
47-
// "org/codehaus/foo/RightClassname.class"
48-
);
54+
"org/codehaus/foo/ReservedWord.class");
4955
}
5056
}

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

+13-2
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,27 @@ protected String getRoleHint() {
1919

2020
@Override
2121
protected int expectedErrors() {
22-
return 6;
22+
return 5;
2323
}
2424

2525
@Override
2626
protected int expectedWarnings() {
27-
return 1;
27+
return 0;
2828
}
2929

3030
@Override
3131
protected Collection<String> expectedOutputFiles() {
32+
String javaVersion = getJavaVersion();
33+
if (javaVersion.contains("9.0")
34+
|| javaVersion.contains("11")
35+
|| javaVersion.contains("17")
36+
|| javaVersion.contains("21")
37+
|| javaVersion.contains("23")) {
38+
return Arrays.asList(
39+
"org/codehaus/foo/Deprecation.class",
40+
"org/codehaus/foo/ExternalDeps.class",
41+
"org/codehaus/foo/Person.class");
42+
}
3243
return Arrays.asList(
3344
"org/codehaus/foo/Deprecation.class",
3445
"org/codehaus/foo/ExternalDeps.class",

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

+13-2
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,27 @@ protected String getRoleHint() {
5353

5454
@Override
5555
protected int expectedErrors() {
56-
return 4;
56+
return 5;
5757
}
5858

5959
@Override
6060
protected int expectedWarnings() {
61-
return 2;
61+
return 1;
6262
}
6363

6464
@Override
6565
protected Collection<String> expectedOutputFiles() {
66+
String javaVersion = getJavaVersion();
67+
if (javaVersion.contains("9.0")
68+
|| javaVersion.contains("11")
69+
|| javaVersion.contains("17")
70+
|| javaVersion.contains("21")
71+
|| javaVersion.contains("23")) {
72+
return Arrays.asList(
73+
"org/codehaus/foo/Deprecation.class",
74+
"org/codehaus/foo/ExternalDeps.class",
75+
"org/codehaus/foo/Person.class");
76+
}
6677
return Arrays.asList(
6778
"org/codehaus/foo/Deprecation.class",
6879
"org/codehaus/foo/ExternalDeps.class",

0 commit comments

Comments
 (0)