Skip to content

Commit 5e670cc

Browse files
committed
use resource root for manifest output too
1 parent f602b15 commit 5e670cc

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ public void apply(Project project) {
6161
t.getDefinitionsDirectory().set(getDefinitionsDirectory(getResourcesDirectory(project)));
6262
t.getManifestFile().set(project.getLayout().getBuildDirectory().file("generated-resources/manifest.txt"));
6363
});
64+
String resourceRoot = TransportVersionUtils.getResourceRoot(project);
6465
project.getTasks().named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, Copy.class).configure(t -> {
65-
t.into("transport/definitions", c -> c.from(generateManifestTask));
66+
t.into(resourceRoot + "/definitions", c -> c.from(generateManifestTask));
6667
});
6768
}
6869
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUtils.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,16 @@ static Directory getResourcesDirectory(Project project) {
5050
if (projectName == null) {
5151
projectName = ":server";
5252
}
53+
var resourceRoot = getResourceRoot(project);
54+
Directory projectDir = project.project(projectName.toString()).getLayout().getProjectDirectory();
55+
return projectDir.dir("src/main/resources/" + resourceRoot);
56+
}
57+
58+
static String getResourceRoot(Project project) {
5359
var resourceRoot = project.findProperty("org.elasticsearch.transport.resourceRoot");
5460
if (resourceRoot == null) {
5561
resourceRoot = "transport";
5662
}
57-
Directory projectDir = project.project(projectName.toString()).getLayout().getProjectDirectory();
58-
return projectDir.dir("src/main/resources/" + resourceRoot);
63+
return resourceRoot.toString();
5964
}
6065
}

0 commit comments

Comments
 (0)