build: Upgrade trustify-da-api-spec 2.0.1 and trustify-da-java-client 0.0.9

Author: soul2zimate

build.gradle.kts

@@ -12,11 +12,6 @@ plugins {
 group = "com.redhat.devtools.intellij"
 version = providers.gradleProperty("projectVersion").get() // Plugin version
 val platformVersion = providers.gradleProperty("ideaVersion").get()
-val exhortRepoUser: String? = findProperty("gpr.username") as String?
-    ?: System.getenv("GITHUB_USERNAME")
-val exhortRepoToken: String? = findProperty("gpr.token") as String?
-    ?: System.getenv("GITHUB_TOKEN")
-
 // Set the JVM language level used to build the project.
 java {
     sourceCompatibility = JavaVersion.VERSION_17
@@ -32,20 +27,6 @@ repositories {
         defaultRepositories()
     }
     maven { url = uri("https://jitpack.io") }
-    maven {
-        url = uri("https://maven.pkg.github.com/trustification/exhort-java-api")
-        credentials {
-            username = exhortRepoUser
-            password = exhortRepoToken
-        }
-    }
-    maven {
-        url = uri("https://maven.pkg.github.com/guacsec/trustify-da-api-spec")
-        credentials {
-            username = exhortRepoUser
-            password = exhortRepoToken
-        }
-    }
 }
 
 sourceSets {
@@ -80,8 +61,8 @@ dependencies {
 
     implementation(libs.github.api)
     implementation(libs.commons.compress)
-    implementation(libs.exhort.api.spec)
-    implementation(libs.exhort.java.api)
+    implementation(libs.trustify.da.api.spec)
+    implementation(libs.trustify.da.java.client)
     implementation(libs.caffeine)
     implementation(libs.packageurl.java)
     implementation(libs.commons.io)

gradle/libs.versions.toml

@@ -3,8 +3,8 @@
 caffeine = "3.1.8"
 commons-compress = "1.21"
 commons-io = "2.16.1"
-exhort-api-spec = "1.0.18"
-exhort-java-api = "0.0.9-SNAPSHOT"
+trustify-da-api-spec = "2.0.1"
+trustify-da-java-client = "0.0.9"
 github-api = "1.314"
 junit = "4.13.2"
 mockito = "4.11.0"
@@ -17,8 +17,8 @@ gradleIntelliJPlugin = "2.6.0"
 caffeine = { group = "com.github.ben-manes.caffeine", name = "caffeine", version.ref = "caffeine" }
 commons-compress = { group = "org.apache.commons", name = "commons-compress", version.ref = "commons-compress" }
 commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons-io" }
-exhort-api-spec = { group = "com.redhat.ecosystemappeng", name = "exhort-api-spec", version.ref = "exhort-api-spec" }
-exhort-java-api = { group = "com.redhat.exhort", name = "exhort-java-api", version.ref = "exhort-java-api" }
+trustify-da-api-spec = { group = "io.github.guacsec", name = "trustify-da-api-model", version.ref = "trustify-da-api-spec" }
+trustify-da-java-client = { group = "io.github.guacsec", name = "trustify-da-java-client", version.ref = "trustify-da-java-client" }
 github-api = { group = "org.kohsuke", name = "github-api", version.ref = "github-api" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }

src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java

@@ -28,7 +28,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.serviceContainer.AlreadyDisposedException;
-import com.redhat.exhort.api.v4.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java

@@ -21,8 +21,8 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
-import com.redhat.exhort.api.v4.DependencyReport;
-import com.redhat.exhort.api.v4.Issue;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.Issue;
 import org.jboss.tools.intellij.exhort.TelemetryService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java

@@ -23,10 +23,10 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
-import com.redhat.exhort.api.v4.AnalysisReport;
-import com.redhat.exhort.api.v4.DependencyReport;
-import com.redhat.exhort.api.v4.ProviderReport;
-import com.redhat.exhort.api.v4.Source;
+import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.ProviderReport;
+import io.github.guacsec.trustifyda.api.v5.Source;
 import org.jboss.tools.intellij.exhort.ApiService;
 
 import java.util.Collections;

src/main/java/org/jboss/tools/intellij/componentanalysis/CAUpdateManifestIntentionAction.java

@@ -19,8 +19,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
-import com.redhat.exhort.api.v4.DependencyReport;
-import com.redhat.exhort.api.PackageRef;
+import io.github.guacsec.trustifyda.api.PackageRef;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;

src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAAnnotator.java

@@ -13,7 +13,7 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.redhat.exhort.api.v4.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
 import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
 import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;

src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAIntentionAction.java

@@ -18,7 +18,7 @@
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.redhat.exhort.api.v4.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
 import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
 import org.jetbrains.annotations.NotNull;

src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAAnnotator.java

@@ -13,7 +13,7 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.redhat.exhort.api.v4.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
 import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
 import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;

src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAIntentionAction.java

@@ -17,7 +17,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
-import com.redhat.exhort.api.v4.DependencyReport;
+import io.github.guacsec.trustifyda.api.v5.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.CAIntentionAction;
 import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.filetype.BuildGradleFileType;