Skip to content

[9.1] Split on line feed when parsing transport files in the build (#135978) #135983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2025
Merged

[9.1] Split on line feed when parsing transport files in the build (#135978) #135983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ public static TransportVersionDefinition fromString(Path file, String contents,

String idsLine = null;
if (contents.isEmpty() == false) {
String[] lines = contents.split(System.lineSeparator());
// Regardless of whether windows newlines exist (they could be added by git), we split on line feed.
// All we care about skipping lines with the comment character, so the remaining \r won't matter
String[] lines = contents.split("\n");
for (String line : lines) {
line = line.replaceAll("\\s+", "");
line = line.strip();
if (line.startsWith("#") == false) {
idsLine = line;
break;
Expand Down
6 changes: 4 additions & 2 deletions ...src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ public static TransportVersionUpperBound fromString(Path file, String contents)
String branch = filename.substring(slashIndex == -1 ? 0 : (slashIndex + 1), filename.length() - 4);

String idsLine = null;
String[] lines = contents.split(System.lineSeparator());
// Regardless of whether windows newlines exist (they could be added by git), we split on line feed.
// All we care about skipping lines with the comment character, so the remaining \r won't matter
String[] lines = contents.split("\n");
for (String line : lines) {
line = line.replaceAll("\\s+", "");
line = line.strip();
if (line.startsWith("#") == false) {
idsLine = line;
break;
Expand Down