Skip to content

Apache Lucene open-source search software

LUCENE-10240: gradle regenerate fails on java 17 (#449)

Dawid Weissbae095ae480f
diff --git a/build.gradle b/build.gradle
index 4d2fbda0442..b13d195f2f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,7 +97,7 @@ configurations {
dependencies {
// Use a newer groovy that doesn't have illegal reflective accesses.
- groovy "org.codehaus.groovy:groovy-all:3.0.7"
+ groovy "org.codehaus.groovy:groovy-all:3.0.9"
}
apply from: file('buildSrc/scriptDepVersions.gradle')
diff --git a/gradle/generation/regenerate.gradle b/gradle/generation/regenerate.gradle
index 78c5f94a2cd..d176c6fcb5f 100644
--- a/gradle/generation/regenerate.gradle
+++ b/gradle/generation/regenerate.gradle
@@ -71,10 +71,11 @@ configure(rootProject) {
*/
modifyFile = { File path, Function<String, String> modify ->
Function<String, String> normalizeEols = { text -> text.replace("\r\n", "\n") }
- modify = normalizeEols.andThen(modify).andThen(normalizeEols)
String original = path.getText("UTF-8")
- String modified = modify.apply(original)
+ String modified = normalizeEols.apply(original)
+ modified = modify.apply(modified)
+ modified = normalizeEols.apply(modified)
if (!original.equals(modified)) {
path.write(modified, "UTF-8")
}