Fix dependency reporting #136209

breskeby · 2025-10-08T16:01:58Z

This has been broken since 9.0.3. likely due to some swallowed api change in
Gradle. This fixes and adds test coverage to dependency reporting used in DRA
artifacts building

elasticsearchmachine · 2025-10-08T16:02:25Z

Pinging @elastic/es-delivery (Team:Delivery)

breskeby · 2025-10-09T07:41:05Z

...d-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java

            var runtimeConfiguration = project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
-            t.getRuntimeArtifacts().set(project.getProviders().provider(() -> runtimeConfiguration.getIncoming().getArtifacts()));
+            t.getRuntimeArtifacts()
+                .set(project.getProviders().provider(() -> createNonTransitiveArtifactsView(runtimeConfiguration).getArtifacts()));


We only care about the direct dependencies here

breskeby · 2025-10-09T07:41:26Z

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

 * </ul>
 */
-public abstract class DependenciesInfoTask extends ConventionTask {
+@CacheableTask


since we removed the convention mapping we can make that task cacheable

breskeby · 2025-10-09T07:43:07Z

distribution/build.gradle

    'https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz'
  ]
  additionalLines << rhelUbiFields.join(',')
+  doLast {


just another safety net to capture suspicious change in behaviour

jozala · 2025-10-09T09:22:01Z

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

+                .map(mcaId -> (ModuleComponentArtifactIdentifier) mcaId)
+                .map(it -> it.getComponentIdentifier())


Do I understand correctly this part was the root cause of missing dependencies in the report? Did Gradle change something in the identifiers hierarchy?

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task

jozala

LGTM.
Thanks for adding comments. It helps to understand the changes more quickly.

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task

elasticsearchmachine · 2025-10-09T19:15:58Z

💔 Backport failed

Status	Branch	Result
❌	8.19	Commit could not be cherrypicked due to conflicts
❌	9.1	Commit could not be cherrypicked due to conflicts
❌	9.0	Commit could not be cherrypicked due to conflicts
❌	8.18	Commit could not be cherrypicked due to conflicts
✅	9.2

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 136209

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d)

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d) # Conflicts: # x-pack/plugin/core/build.gradle

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d) # Conflicts: # modules/repository-s3/build.gradle # plugins/discovery-ec2/build.gradle # x-pack/plugin/core/build.gradle

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java # modules/repository-s3/build.gradle # x-pack/plugin/core/build.gradle # x-pack/plugin/identity-provider/build.gradle

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java # modules/repository-s3/build.gradle # plugins/discovery-ec2/build.gradle # x-pack/plugin/core/build.gradle # x-pack/plugin/identity-provider/build.gradle

breskeby · 2025-10-09T19:32:50Z

💚 All backports created successfully

Status	Branch	Result
✅	9.2
✅	9.1
✅	9.0
✅	8.19
✅	8.18

Questions ?

Please refer to the Backport tool documentation

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d)

* Fix dependency reporting (#136209) This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task (cherry picked from commit f74406d) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java # modules/repository-s3/build.gradle # x-pack/plugin/core/build.gradle # x-pack/plugin/identity-provider/build.gradle * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <[email protected]>

breskeby requested a review from a team as a code owner October 8, 2025 16:01

breskeby added >non-issue :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team auto-backport Automatically create backport pull requests when merged v8.19.6 v9.1.6 v9.0.9 v8.18.9 v9.2.1 v9.3.0 labels Oct 8, 2025

breskeby self-assigned this Oct 8, 2025

breskeby commented Oct 9, 2025

View reviewed changes

breskeby force-pushed the fix-dependency-reporting branch 2 times, most recently from 8d4d7c6 to 46e91f1 Compare October 9, 2025 07:53

jozala reviewed Oct 9, 2025

View reviewed changes

breskeby added 2 commits October 9, 2025 11:53

Fix dependency reporting

d4e85e3

This has been broken since 9.0.3. likely due to some swallowed api change in Gradle. This fixes and adds test coverage to dependency reporting used in DRA artifacts building Fix interdependency to Licenses task

Fix spotless

f252c2d

breskeby force-pushed the fix-dependency-reporting branch from 4855ac1 to f252c2d Compare October 9, 2025 09:53

jozala approved these changes Oct 9, 2025

View reviewed changes

breskeby added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Oct 9, 2025

breskeby added 3 commits October 9, 2025 13:23

fix integration build tools integration tests

3b93125

Simplify test

ca74c08

Fix BuildPluginFuncTest for now

5af193d

breskeby merged commit f74406d into elastic:main Oct 9, 2025
33 of 34 checks passed

breskeby deleted the fix-dependency-reporting branch October 9, 2025 19:14

breskeby mentioned this pull request Oct 9, 2025

[9.2] Fix dependency reporting (#136209) #136316

Merged

elasticsearchmachine added the backport pending label Oct 9, 2025

breskeby mentioned this pull request Oct 9, 2025

[9.1] Fix dependency reporting (#136209) #136317

Open

This was referenced Oct 9, 2025

[9.0] Fix dependency reporting (#136209) #136318

Open

[8.19] Fix dependency reporting (#136209) #136319

Merged

breskeby mentioned this pull request Oct 9, 2025

[8.18] Fix dependency reporting (#136209) #136320

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix dependency reporting #136209

Fix dependency reporting #136209

Uh oh!

breskeby commented Oct 8, 2025

Uh oh!

elasticsearchmachine commented Oct 8, 2025

Uh oh!

breskeby Oct 9, 2025

Uh oh!

breskeby Oct 9, 2025

Uh oh!

breskeby Oct 9, 2025

Uh oh!

jozala Oct 9, 2025

Uh oh!

breskeby Oct 9, 2025

Uh oh!

jozala left a comment

Uh oh!

Uh oh!

elasticsearchmachine commented Oct 9, 2025

Uh oh!

breskeby commented Oct 9, 2025

Uh oh!

Uh oh!

		.map(mcaId -> (ModuleComponentArtifactIdentifier) mcaId)
		.map(it -> it.getComponentIdentifier())

Fix dependency reporting #136209

Fix dependency reporting #136209

Uh oh!

Conversation

breskeby commented Oct 8, 2025

Uh oh!

elasticsearchmachine commented Oct 8, 2025

Uh oh!

breskeby Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

breskeby Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

breskeby Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

jozala Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

breskeby Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

jozala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticsearchmachine commented Oct 9, 2025

💔 Backport failed

Uh oh!

breskeby commented Oct 9, 2025

💚 All backports created successfully

Questions ?

Uh oh!

Uh oh!