refactor: use exhort-api-spec

Signed-off-by: Chao Wang <[email protected]>

Author: soul2zimate

build.gradle

@@ -2,17 +2,27 @@ plugins {
    id "org.jetbrains.intellij" version "1.17.4"
 }
 
+def exhortRepoUser = findProperty("gpr.username") ?: System.getenv("GITHUB_USERNAME")
+def exhortRepoToken = findProperty("gpr.token") ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
     mavenCentral()
 	flatDir {
 	    dirs buildDir
 	}
     maven { url 'https://jitpack.io' }
     maven {
-        url 'https://maven.pkg.github.com/RHEcosystemAppEng/exhort-java-api'
+        url 'https://maven.pkg.github.com/trustification/exhort-java-api'
+        credentials {
+            username = exhortRepoUser
+            password = exhortRepoToken
+        }
+    }
+    maven {
+        url 'https://maven.pkg.github.com/trustification/exhort-api-spec'
         credentials {
-            username = project.findProperty("gpr.username") ?: System.getenv("GITHUB_USERNAME")
-            password = project.findProperty("gpr.token") ?: System.getenv("GITHUB_TOKEN")
+            username = exhortRepoUser
+            password = exhortRepoToken
         }
     }
 }
@@ -61,6 +71,7 @@ dependencies {
 
     implementation 'org.kohsuke:github-api:1.314'
     implementation 'org.apache.commons:commons-compress:1.21'
+    implementation 'com.redhat.ecosystemappeng:exhort-api-spec:1.0.6'
     implementation 'com.redhat.exhort:exhort-java-api:0.0.8-SNAPSHOT'
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
     // https://mvnrepository.com/artifact/com.github.package-url/packageurl-java

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

@@ -27,7 +27,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.serviceContainer.AlreadyDisposedException;
-import com.redhat.exhort.api.DependencyReport;
+import com.redhat.exhort.api.v4.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.DependencyReport;
-import com.redhat.exhort.api.Issue;
+import com.redhat.exhort.api.v4.DependencyReport;
+import com.redhat.exhort.api.v4.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

@@ -18,10 +18,10 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
-import com.redhat.exhort.api.AnalysisReport;
-import com.redhat.exhort.api.DependencyReport;
-import com.redhat.exhort.api.ProviderReport;
-import com.redhat.exhort.api.Source;
+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 org.apache.commons.io.FileUtils;
 import org.jboss.tools.intellij.exhort.ApiService;
 import org.jetbrains.annotations.NotNull;

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

@@ -19,7 +19,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
-import com.redhat.exhort.api.DependencyReport;
+import com.redhat.exhort.api.v4.DependencyReport;
 import com.redhat.exhort.api.PackageRef;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -18,7 +18,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.redhat.exhort.api.DependencyReport;
+import com.redhat.exhort.api.v4.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.*;
 
 import java.util.*;

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

@@ -18,7 +18,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.redhat.exhort.api.DependencyReport;
+import com.redhat.exhort.api.v4.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

@@ -18,7 +18,7 @@
 import com.intellij.psi.xml.XmlDocument;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
-import com.redhat.exhort.api.DependencyReport;
+import com.redhat.exhort.api.v4.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.*;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.psi.Artifact;
 import org.jboss.tools.intellij.componentanalysis.maven.MavenCAUpdateManifestIntentionAction;

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.DependencyReport;
+import com.redhat.exhort.api.v4.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;

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

@@ -6,7 +6,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
-import com.redhat.exhort.api.DependencyReport;
+import com.redhat.exhort.api.v4.DependencyReport;
 import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.filetype.BuildGradleFileType;
 import org.jboss.tools.intellij.componentanalysis.gradle.build.psi.BuildGradleFile;