Apache Lucene open-source search software
Improve gjf error message and upgrade to 1.37.0 (#16782)
Dawid Weissa98bd4465935
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/hacks/HacksPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/hacks/HacksPlugin.javaindex b2d374bff5a..621b34027c5 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/hacks/HacksPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/hacks/HacksPlugin.java@@ -63,7 +63,7 @@ public class HacksPlugin extends LuceneGradlePlugin {project.getLayout().getBuildDirectory()- .file("tasks/${task.name}/dummy-output.txt")+ .file("tasks/" + task.getName() + "/dummy-output.txt").get().getAsFile();task.getOutputs().file(dummyOutput);diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/ParentGoogleJavaFormatTask.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/ParentGoogleJavaFormatTask.javaindex d2d96419812..5e2e4ec40fd 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/ParentGoogleJavaFormatTask.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/ParentGoogleJavaFormatTask.java@@ -37,6 +37,8 @@ import java.util.stream.Collectors;import java.util.stream.StreamSupport;import javax.inject.Inject;import org.gradle.api.DefaultTask;+import org.gradle.api.GradleException;+import org.gradle.api.JavaVersion;import org.gradle.api.file.ConfigurableFileCollection;import org.gradle.api.file.FileType;import org.gradle.api.file.ProjectLayout;@@ -136,11 +138,29 @@ abstract class ParentGoogleJavaFormatTask extends DefaultTask {input = input + "\n";}- input = ImportOrderer.reorderImports(input, JavaFormatterOptions.Style.GOOGLE);- input = RemoveUnusedImports.removeUnusedImports(input);- input = formatter.formatSource(input);+ try {+ input = ImportOrderer.reorderImports(input, JavaFormatterOptions.Style.GOOGLE);+ input = RemoveUnusedImports.removeUnusedImports(input);+ input = formatter.formatSource(input);+ // intentionally left out.+ // input = StringWrapper.wrap(input, formatter);+ } catch (FormatterException e) {+ String details;+ if (e.getMessage().contains("com.sun")) {+ details =+ "It is likely that this version does not support Java "+ + JavaVersion.current().getMajorVersion()+ + ". ";+ } else {+ details = "";+ }- // input = StringWrapper.wrap(input, formatter);+ throw new GradleException(+ "google-java-formatter threw an exception. "+ + details+ + "Rerun with gradle's --stacktrace option and report the problem.",+ e);+ }return input;}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex ee875dc2985..b41a11309bf 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -15,7 +15,7 @@ errorprone = "2.50.0"# markdown documentation generationflexmark = "0.64.8"# @keep This is GJF version for java source code formatting-googleJavaFormat = "1.36.1"+googleJavaFormat = "1.37.0"# gradle build supportgroovy = "6.0.0"# test assertions