Ver Fonte

Fix task ordering problem between `SpdxSbomTask` and `Sign` when publishing (#11444)

Tyler Benson há 9 meses atrás
pai
commit
b21044349c
1 ficheiros alterados com 4 adições e 0 exclusões
  1. 4 0
      javaagent/build.gradle.kts

+ 4 - 0
javaagent/build.gradle.kts

@@ -1,6 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.render.InventoryMarkdownReportRenderer
 import com.github.jk1.license.render.InventoryMarkdownReportRenderer
+import org.spdx.sbom.gradle.SpdxSbomTask
 import java.util.UUID
 import java.util.UUID
 
 
 plugins {
 plugins {
@@ -295,6 +296,9 @@ tasks.withType<AbstractPublishToMaven> {
   dependsOn("spdxSbom")
   dependsOn("spdxSbom")
 }
 }
 project.afterEvaluate {
 project.afterEvaluate {
+  tasks.withType<Sign>().configureEach {
+    mustRunAfter(tasks.withType<SpdxSbomTask>())
+  }
   tasks.withType<PublishToMavenLocal>().configureEach {
   tasks.withType<PublishToMavenLocal>().configureEach {
     this.publication.artifact("${layout.buildDirectory.get()}/spdx/opentelemetry-javaagent.spdx.json") {
     this.publication.artifact("${layout.buildDirectory.get()}/spdx/opentelemetry-javaagent.spdx.json") {
       classifier = "spdx"
       classifier = "spdx"