Skip to content

Commit 1be6776

Browse files
Bump org.eclipse.jdt:ecj from 3.40.0 to 3.42.0 (#1223)
Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.40.0 to 3.42.0. <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/eclipse-jdt/eclipse.jdt.core/commits">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.eclipse.jdt:ecj&package-manager=maven&previous-version=3.40.0&new-version=3.42.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
2 parents 9aad6af + aaa99eb commit 1be6776

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
106106

107107
<junit.version>5.13.1</junit.version>
108-
<ecj.version>3.40.0</ecj.version>
108+
<ecj.version>3.42.0</ecj.version>
109109
<jdo.version>3.2.1</jdo.version>
110110
<springboot.version>3.5.0</springboot.version>
111111
<spring.version>6.2.8</spring.version>

querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ECJEvaluatorFactory.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ public class ECJEvaluatorFactory extends AbstractEvaluatorFactory {
6161

6262
public static CompilerOptions getDefaultCompilerOptions() {
6363
var javaSpecVersion = System.getProperty("java.specification.version");
64+
// use Java 8 compliance to disable module support and avoid NPE in newer ECJ versions
65+
if (!javaSpecVersion.startsWith("1.")) {
66+
javaSpecVersion = "1.8";
67+
}
6468
Map<String, String> settings = new HashMap<>();
6569
settings.put(CompilerOptions.OPTION_Source, javaSpecVersion);
6670
settings.put(CompilerOptions.OPTION_TargetPlatform, javaSpecVersion);

0 commit comments

Comments
 (0)