Skip to content
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

Bump org.eclipse.jdt:ecj from 3.38.0 to 3.40.0 #422

Merged
merged 2 commits into from
Dec 26, 2024
Merged

Bump org.eclipse.jdt:ecj from 3.38.0 to 3.40.0 #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70343c3
Bump org.eclipse.jdt:ecj from 3.38.0 to 3.40.0
dependabot[bot] Dec 25, 2024
8d5b80c
Try to fix
slachiewicz Dec 25, 2024
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
2 changes: 1 addition & 1 deletion plexus-compilers/plexus-compiler-eclipse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.38.0</version>
<version>3.40.0</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
Expand Down
6 changes: 3 additions & 3 deletions ...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,11 @@ public CompilerResult performCompile(CompilerConfiguration config) throws Compil
getLog().debug("Using JSR-199 EclipseCompiler");
// ECJ JSR-199 compiles against the latest Java version it supports if no source
// version is given explicitly. BatchCompiler uses 1.3 as default. So check
// whether a source version is specified, and if not supply 1.3 explicitly.
// whether a source version is specified, and if not supply 8 explicitly.
if (!haveSourceOrReleaseArgument(args)) {
getLog().debug("ecj: no source level nor release specified, defaulting to Java 1.3");
getLog().debug("ecj: no source level nor release specified, defaulting to Java 8");
args.add("-source");
args.add("1.3");
args.add("8");
}

// Also check for the encoding. Could have been set via the CompilerConfig
Expand Down
18 changes: 12 additions & 6 deletions ...c/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,21 @@ protected int expectedWarnings() {

@Override
protected Collection<String> expectedOutputFiles() {
String javaVersion = getJavaVersion();
if (javaVersion.contains("9.0")
|| javaVersion.contains("11")
|| javaVersion.contains("17")
|| javaVersion.contains("21")
|| javaVersion.contains("23")) {
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
"org/codehaus/foo/Person.class");
}
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
"org/codehaus/foo/Person.class",
"org/codehaus/foo/ReservedWord.class"
// "org/codehaus/foo/Bad.class", // This one has no class file generated as it's one big
// issue
// "org/codehaus/foo/UnknownSymbol.class",
// "org/codehaus/foo/RightClassname.class"
);
"org/codehaus/foo/ReservedWord.class");
}
}
15 changes: 13 additions & 2 deletions ...src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,27 @@ protected String getRoleHint() {

@Override
protected int expectedErrors() {
return 6;
return 5;
}

@Override
protected int expectedWarnings() {
return 1;
return 0;
}

@Override
protected Collection<String> expectedOutputFiles() {
String javaVersion = getJavaVersion();
if (javaVersion.contains("9.0")
|| javaVersion.contains("11")
|| javaVersion.contains("17")
|| javaVersion.contains("21")
|| javaVersion.contains("23")) {
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
"org/codehaus/foo/Person.class");
}
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
Expand Down
15 changes: 13 additions & 2 deletions ...piler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,27 @@ protected String getRoleHint() {

@Override
protected int expectedErrors() {
return 4;
return 5;
}

@Override
protected int expectedWarnings() {
return 2;
return 1;
}

@Override
protected Collection<String> expectedOutputFiles() {
String javaVersion = getJavaVersion();
if (javaVersion.contains("9.0")
|| javaVersion.contains("11")
|| javaVersion.contains("17")
|| javaVersion.contains("21")
|| javaVersion.contains("23")) {
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
"org/codehaus/foo/Person.class");
}
return Arrays.asList(
"org/codehaus/foo/Deprecation.class",
"org/codehaus/foo/ExternalDeps.class",
Expand Down
Loading