Skip to content

[9.1] Rename the transport version generate task to be shorter (#134420) #134642

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
Sep 12, 2025
+8 −8
Merged

[9.1] Rename the transport version generate task to be shorter (#134420) #134642

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
2 changes: 1 addition & 1 deletion ...roovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
apply plugin: 'elasticsearch.transport-version-references'
apply plugin: 'elasticsearch.transport-version-resources'
tasks.named('generateTransportVersionDefinition') {
tasks.named('generateTransportVersion') {
currentUpperBoundName = '9.2'
}
"""
Expand Down
12 changes: 6 additions & 6 deletions ...ovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
def runGenerateAndValidateTask(String... additionalArgs) {
List<String> args = new ArrayList<>()
args.add(":myserver:validateTransportVersionResources")
args.add(":myserver:generateTransportVersionDefinition")
args.add(":myserver:generateTransportVersion")
args.addAll(additionalArgs);
return gradleRunner(args.toArray())
}

def runGenerateTask(String... additionalArgs) {
List<String> args = new ArrayList<>()
args.add(":myserver:generateTransportVersionDefinition")
args.add(":myserver:generateTransportVersion")
args.addAll(additionalArgs);
return gradleRunner(args.toArray())
}
Expand All @@ -35,11 +35,11 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
}

void assertGenerateSuccess(BuildResult result) {
assert result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.SUCCESS
assert result.task(":myserver:generateTransportVersion").outcome == TaskOutcome.SUCCESS
}

void assertGenerateFailure(BuildResult result, String expectedOutput) {
assert result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.FAILED
assert result.task(":myserver:generateTransportVersion").outcome == TaskOutcome.FAILED
assertOutputContains(result.output, expectedOutput)
}

Expand Down Expand Up @@ -449,7 +449,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
referencedTransportVersion("new_tv")
file("myserver/alt_upper_bound.csv").text = "some_tv,8126000"
file("myserver/build.gradle") << """
tasks.named('generateTransportVersionDefinition') {
tasks.named('generateTransportVersion') {
alternateUpperBoundFile = project.file("alt_upper_bound.csv")
}
tasks.named('validateTransportVersionResources') {
Expand All @@ -470,7 +470,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
referencedTransportVersion("new_tv")
file("myserver/alt_upper_bound.csv").text = "some_tv,8122100"
file("myserver/build.gradle") << """
tasks.named('generateTransportVersionDefinition') {
tasks.named('generateTransportVersion') {
alternateUpperBoundFile = project.file("alt_upper_bound.csv")
}
tasks.named('validateTransportVersionResources') {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void apply(Project project) {
});

var generateDefinitionsTask = project.getTasks()
.register("generateTransportVersionDefinition", GenerateTransportVersionDefinitionTask.class, t -> {
.register("generateTransportVersion", GenerateTransportVersionDefinitionTask.class, t -> {
t.setGroup(taskGroup);
t.setDescription("(Re)generates a transport version definition file");
t.getReferencesFiles().setFrom(tvReferencesConfig);
Expand Down