diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 8ff66df9317..2816f18a0e2 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
com.gradle
develocity-maven-extension
- 1.22.2
+ 2.6.1
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JParser.java b/java-frontend/src/main/java/org/sonar/java/model/JParser.java
index 21c7ccb338c..e311d4a2919 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JParser.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JParser.java
@@ -41,14 +41,14 @@ private JParser() {
}
/**
- * Parses and attributes one compilation unit on its own, against the running JDK only. Batch analysis goes
- * through {@link JParserConfig}, which scans every file of the project before translating.
+ * Parses and attributes one compilation unit against the running JDK only. Batch analysis goes
+ * through {@link JParserConfig}, which scans the current batch before translating.
*/
public static JavaTree.CompilationUnitTreeImpl parse(String version, String unitName, String source) {
return parse(version, unitName, source, List.of());
}
- /** {@link #parse(String, String, String)} with a classpath, as ECJ attributed single sources. */
+ /** The classpath parameter is retained for compatibility and is not forwarded to SemSitter. */
public static JavaTree.CompilationUnitTreeImpl parse(String version, String unitName, String source, List classpath) {
Objects.requireNonNull(version);
Objects.requireNonNull(unitName);
@@ -61,7 +61,7 @@ public static JavaTree.CompilationUnitTreeImpl parse(String version, String unit
Files.writeString(file, source, StandardCharsets.UTF_8);
JsonObject document;
synchronized (bridge) {
- bridge.analyze(directory, List.of(file), JParserConfig.bridgeClasspath(classpath));
+ bridge.analyze(directory, List.of(file), JParserConfig.jdkClasspath());
document = bridge.cst(file.toString());
}
JSema sema = new JSema();
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JParserConfig.java b/java-frontend/src/main/java/org/sonar/java/model/JParserConfig.java
index 37aee277ec6..180a5ba2c4e 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JParserConfig.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JParserConfig.java
@@ -212,7 +212,7 @@ void openBridge(List extends InputFile> files) {
bridge.analyze(
root == null ? Path.of(".") : root,
files.stream().map(file -> file.path().toAbsolutePath()).toList(),
- bridgeClasspath(classpath));
+ jdkClasspath());
}
} catch (Exception failure) {
closeBridge();
@@ -220,18 +220,8 @@ void openBridge(List extends InputFile> files) {
}
}
- /**
- * The project classpath preceded by the runtime image of the running JDK, which is the JDK ECJ resolved
- * against, so JDK classes win over a library copy as on the boot classpath.
- */
- static List bridgeClasspath(List classpath) {
- List entries = new ArrayList<>();
- Path image = Path.of(System.getProperty("java.home"), "lib", "modules");
- if (image.toFile().isFile()) {
- entries.add(image.toString());
- }
- classpath.stream().map(File::getAbsolutePath).forEach(entries::add);
- return entries;
+ static List jdkClasspath() {
+ return List.of(Path.of(System.getProperty("java.home"), "lib", "modules").toString());
}
void closeBridge() {