Skip to content

Commit c0d3a73

Browse files
authored
[Build] Update InternalTestArtifact plugin to reference unique artifacts (elastic#138970) (elastic#139037)
* [Build] Update InternalTestArtifact plugin to reference unique artifacts This ensures that we can reference multiple test artfiacts of the same type (e.g. javaRestTest) by taking the group name into account for the referenced capability * Fix testFixture shortcut * Fix test fixture capability references
1 parent 25c3d52 commit c0d3a73

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ similar to how the Gradle build-in `java-test-fixtures` plugin works.
239239
```
240240
dependencies {
241241
testImplementation(project(":fixture-providing-project')) {
242-
requireCapabilities("org.elasticsearch.gradle:fixture-providing-project-test-artifacts")
242+
requireCapabilities(${project(":fixture-providing-project').group}:fixture-providing-project-test-artifacts")
243243
}
244244
}
245245
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void registerTestArtifactFromSourceSet(SourceSet sourceSet) {
3434
JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
3535
javaPluginExtension.registerFeature(name + "Artifacts", featureSpec -> {
3636
featureSpec.usingSourceSet(sourceSet);
37-
featureSpec.capability("org.elasticsearch.gradle", project.getName() + "-" + sourceSet.getName() + "-artifacts", "1.0");
37+
featureSpec.capability(project.getGroup().toString(), project.getName() + "-" + sourceSet.getName() + "-artifacts", "1.0");
3838
// This feature is only used internally in the
3939
// elasticsearch build so we do not need any publication.
4040
featureSpec.disablePublication();

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ tasks.named('zipAggregation').configure {
9595
ext.testArtifact = { p, String name = "test" ->
9696
def projectDependency = p.dependencies.create(p)
9797
projectDependency.capabilities {
98-
requireCapabilities("org.elasticsearch.gradle:${projectDependency.name}-${name}-artifacts")
98+
requireCapabilities("${p.group}:${projectDependency.name}-${name}-artifacts")
9999
};
100100
}
101101

test/external-modules/esql-heap-attack/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
1111
// Necessary to use tests in Serverless
1212
apply plugin: 'elasticsearch.internal-test-artifact'
1313

14-
group = 'org.elasticsearch.plugin'
15-
1614
esplugin {
1715
description = 'A test module that can trigger out of memory'
1816
classname ='org.elasticsearch.test.esql.heap_attack.HeapAttackPlugin'

0 commit comments

Comments
 (0)