Skip to content

Commit 1f6cd5c

Browse files
authored
Fix backwards compatibility with pre-Java11 build-tools users (#45633)
1 parent a635eca commit 1f6cd5c

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

buildSrc/build.gradle

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@ sourceSets {
7171
minimumRuntime { }
7272
}
7373

74-
allprojects {
75-
apply plugin: 'java'
76-
targetCompatibility = 11
77-
sourceCompatibility = 11
78-
}
79-
8074
configurations {
8175
reaper
8276
}
@@ -160,8 +154,8 @@ if (project != rootProject) {
160154
apply plugin: 'nebula.maven-scm'
161155

162156
allprojects {
163-
targetCompatibility = 11
164-
sourceCompatibility = 11
157+
targetCompatibility = 10
158+
sourceCompatibility = 10
165159
}
166160

167161
// groovydoc succeeds, but has some weird internal exception...

buildSrc/reaper/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apply plugin: 'java'
2+
13
jar {
24
archiveName = "${project.name}.jar"
35
manifest {

buildSrc/src/main/java/org/elasticsearch/gradle/ReaperService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
import org.gradle.api.logging.Logger;
2525
import org.gradle.internal.jvm.Jvm;
2626

27+
import java.io.FileWriter;
2728
import java.io.IOException;
2829
import java.io.InputStream;
2930
import java.io.OutputStream;
3031
import java.io.UncheckedIOException;
3132
import java.net.URL;
3233
import java.nio.file.Files;
3334
import java.nio.file.Path;
35+
import java.nio.file.Paths;
3436
import java.util.regex.Matcher;
3537
import java.util.regex.Pattern;
3638

@@ -68,8 +70,8 @@ public void registerPid(String serviceId, long pid) {
6870
public void registerCommand(String serviceId, String... command) {
6971
ensureReaperStarted();
7072

71-
try {
72-
Files.writeString(getCmdFile(serviceId), String.join(" ", command));
73+
try (FileWriter writer = new FileWriter(getCmdFile(serviceId).toFile())) {
74+
writer.write(String.join(" ", command));
7375
} catch (IOException e) {
7476
throw new UncheckedIOException(e);
7577
}
@@ -143,7 +145,7 @@ private Path locateReaperJar() {
143145

144146
if (matcher.matches()) {
145147
String path = matcher.group(1);
146-
return Path.of(
148+
return Paths.get(
147149
OS.<String>conditional()
148150
.onWindows(() -> path.substring(1))
149151
.onUnix(() -> path)

0 commit comments

Comments
 (0)