From fc581b6c1565db81a158114e111b373097026c8e Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 11 Jun 2025 21:34:24 +0200 Subject: [PATCH] Ensure deterministic task execution ordering in DRA (#2413) - we push different tasks output into build/distribution - should be not necessary ones we remove osshr compliant maven dra artifacts (cherry picked from commit a724c49a947b04dc4bbcd8cdbd4d1f58e49fa556) --- dist/build.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dist/build.gradle b/dist/build.gradle index 326b2a7f5..6aff384c1 100644 --- a/dist/build.gradle +++ b/dist/build.gradle @@ -198,7 +198,6 @@ project.tasks.named('dependencyLicenses', DependencyLicensesTask) { it.dependencies = project.configurations.licenseChecks } - tasks.register('copyPoms', Copy) { BasePluginExtension baseExtension = project.getExtensions().getByType(BasePluginExtension.class); from(tasks.named('generatePomFileForMainPublication')) @@ -206,6 +205,14 @@ tasks.register('copyPoms', Copy) { rename 'pom-default.xml', "${baseExtension.archivesName.get()}-${project.getVersion()}.pom" } +tasks.named('collectArtifacts') { + mustRunAfter 'publishMainPublicationToNmcpMainRepository' +} + +tasks.named('publishMainPublicationToNmcpMainRepository') { + mustRunAfter 'copyPoms' +} + tasks.named('distribution').configure { dependsOn 'copyPoms' } \ No newline at end of file