From 418404b597f1b27907f7503d9f0f3b8afe7dbfaa Mon Sep 17 00:00:00 2001
From: Bogdan Mukvich <bogdan.mukvich@jetbrains.com>
Date: Mon, 10 Jul 2023 16:26:49 +0200
Subject: [PATCH] Support NOASSERTION value for downloadUrl in SBOM

Fixes compatibility with Gradle 8.2

^KTI-1289
---
 buildSrc/build.gradle.kts        |  2 +-
 buildSrc/src/main/kotlin/sbom.kt | 12 ++++++++++++
 gradle/verification-metadata.xml |  8 ++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 572d800686a..a4de98bc646 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -100,7 +100,7 @@ dependencies {
     implementation("com.gradle.publish:plugin-publish-plugin:1.0.0")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
 
-    implementation("org.spdx:spdx-gradle-plugin:0.1.0-dev-7")
+    implementation("org.spdx:spdx-gradle-plugin:0.1.0-dev-8")
 
     implementation("com.jakewharton.dex:dex-member-list:4.1.1")
 
diff --git a/buildSrc/src/main/kotlin/sbom.kt b/buildSrc/src/main/kotlin/sbom.kt
index 0117270b5c0..379965d2541 100644
--- a/buildSrc/src/main/kotlin/sbom.kt
+++ b/buildSrc/src/main/kotlin/sbom.kt
@@ -5,6 +5,7 @@
 
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ModuleVersionIdentifier
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.TaskProvider
@@ -12,7 +13,9 @@ import org.gradle.kotlin.dsl.*
 import org.spdx.sbom.gradle.SpdxSbomExtension
 import org.spdx.sbom.gradle.SpdxSbomPlugin
 import org.spdx.sbom.gradle.SpdxSbomTask
+import org.spdx.sbom.gradle.extensions.DefaultSpdxSbomTaskExtension
 import plugins.mainPublicationName
+import java.net.URI
 import java.util.*
 
 
@@ -48,6 +51,15 @@ fun Project.configureSbom(
         }
     }
 
+    val NOASSERTION = URI.create("NOASSERTION")
+    tasks.withType<SpdxSbomTask>().configureEach {
+        taskExtension.set(object : DefaultSpdxSbomTaskExtension() {
+            override fun mapRepoUri(input: URI?, moduleId: ModuleVersionIdentifier): URI {
+                return NOASSERTION
+            }
+        })
+    }
+
     val sbomOutputDirectory = layout.buildDirectory.dir("spdx/$targetName")
     val spdxSbomTask = tasks.named<SpdxSbomTask>("spdxSbomFor$targetName") {
         outputDirectory.set(sbomOutputDirectory)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 0f1050fa240..25bdd27624e 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -10175,10 +10175,10 @@
             <sha256 value="a16f0e6ec5915ed7b0f63b51f91d2fc8208dbed0d9abc38f8307e5594eb14acd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.spdx" name="spdx-gradle-plugin" version="0.1.0-dev-7">
-         <artifact name="spdx-gradle-plugin-0.1.0-dev-7.jar">
-            <md5 value="9482b6fecd61f9869d3522417e9ce3f6" origin="Generated by Gradle"/>
-            <sha256 value="3c947de7b6ab52f1afa81c32437538a3ee168cb09c31be59d4d85d2eaa910fe0" origin="Generated by Gradle"/>
+      <component group="org.spdx" name="spdx-gradle-plugin" version="0.1.0-dev-8">
+         <artifact name="spdx-gradle-plugin-0.1.0-dev-8.jar">
+            <md5 value="53ed42f7b4cb315fba121dfa14a09011" origin="Generated by Gradle"/>
+            <sha256 value="e30fb612e0a8b59b9d353104543c2ec3dcc2e403c58808091560450632231842" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.spdx" name="spdx-jackson-store" version="1.1.6">