Skip to content

Commit 73af578

Browse files
committed
fix dependency link
1 parent a69872e commit 73af578

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/plugin/GenerateTestBuildInfoTask.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ public void generatePropertiesFile() throws IOException {
6868
writer.write(getComponentName().get());
6969
writer.write("\",\n");
7070

71-
writer.write(" \"descriptor\": \"");
72-
writer.write(getDescriptorFile().getAsFile().get().getAbsolutePath());
73-
writer.write("\",\n");
71+
if (getDescriptorFile().isPresent()) {
72+
writer.write(" \"descriptor\": \"");
73+
writer.write(getDescriptorFile().getAsFile().get().getAbsolutePath());
74+
writer.write("\",\n");
75+
}
7476

7577
if (getPolicyFile().isPresent()) {
7678
writer.write(" \"policy\": \"");

build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919
import org.gradle.api.provider.ProviderFactory;
2020
import org.gradle.api.tasks.SourceSet;
2121
import org.gradle.api.tasks.SourceSetContainer;
22+
import org.gradle.jvm.tasks.Jar;
2223

2324
import javax.inject.Inject;
2425

26+
import static java.util.stream.Collectors.toList;
27+
2528
/**
2629
* Encapsulates build configuration for an Elasticsearch plugin.
2730
*/
@@ -58,8 +61,8 @@ public void apply(final Project project) {
5861
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
5962

6063
var testBuildInfoTask = project.getTasks().register("generateTestBuildInfo", GenerateTestBuildInfoTask.class, task -> {
61-
var pluginProperties = project.getTasks().getByName("pluginProperties");
62-
task.getDescriptorFile().set(pluginProperties.getOutputs().getFiles().getSingleFile());
64+
var pluginProperties = project.getTasks().withType(GeneratePluginPropertiesTask.class).named("pluginProperties");
65+
task.getDescriptorFile().set(pluginProperties.flatMap(GeneratePluginPropertiesTask::getOutputFile));
6366
var propertiesExtension = project.getExtensions().getByType(PluginPropertiesExtension.class);
6467
task.getComponentName().set(providerFactory.provider(propertiesExtension::getName));
6568
var policy = project.getLayout().getProjectDirectory().file("src/main/plugin-metadata/entitlement-policy.yaml");
@@ -80,10 +83,15 @@ public void apply(final Project project) {
8083
task.getOutputDirectory().set(directory);
8184
});
8285

83-
8486
sourceSets.named(SourceSet.TEST_SOURCE_SET_NAME).configure(sourceSet -> {
8587
sourceSet.getResources().srcDir(testBuildInfoTask);
8688
});
89+
90+
// TODO: get the jar task
91+
// TODO: configure on this task
92+
// TODO: task.from()
93+
//project.getLogger().lifecycle(
94+
// "HELLO: " + project.getTasks().withType(Jar.class).getByName("jar").getArchiveFile().get().getAsFile().getAbsolutePath());
8795
}
8896

8997
}

build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,6 @@ public static String projectPath(String taskPath) {
219219
public static boolean isIncludedBuild(Project project) {
220220
return project.getGradle().getParent() != null;
221221
}
222+
223+
// TODO: helper method for test and jar
222224
}

0 commit comments

Comments
 (0)