Skip to content

refactor: use exhort-api-spec #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruromero merged 1 commit into from
May 13, 2025
Merged

refactor: use exhort-api-spec #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/CAAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/jboss/tools/intellij/componentanalysis/CAUpdateManifestIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../jboss/tools/intellij/componentanalysis/gradle/GradleCAUpdateManifestIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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 java.util.*;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.intellij.psi.PsiFile;
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.CAIntentionAction;
import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/jboss/tools/intellij/componentanalysis/maven/MavenCAUpdateManifestIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.intellij.psi.xml.XmlTag;
import com.intellij.psi.xml.XmlText;
import com.intellij.xml.util.XmlUtil;
import com.redhat.exhort.api.DependencyReport;
import com.redhat.exhort.api.v4.DependencyReport;
import com.redhat.exhort.api.PackageRef;
import org.jboss.tools.intellij.componentanalysis.CAUpdateManifestIntentionAction;
import org.jetbrains.annotations.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/npm/NpmCAAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.intellij.json.psi.*;
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.*;

import java.util.*;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/npm/NpmCAIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

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.*;
import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReq;
import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReqComment;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAIntentionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.pypi.requirements.filetype.RequirementsFileType;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/exhort/ApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.openapi.extensions.PluginId;
import com.redhat.exhort.Api;
import com.redhat.exhort.api.AnalysisReport;
import com.redhat.exhort.api.v4.AnalysisReport;
import com.redhat.exhort.impl.ExhortApi;
import org.jboss.tools.intellij.settings.ApiSettingsState;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/exhort/TelemetryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.intellij.psi.PsiFile;
import com.redhat.devtools.intellij.telemetry.core.service.TelemetryMessageBuilder;
import com.redhat.devtools.intellij.telemetry.core.util.Lazy;
import com.redhat.exhort.api.DependencyReport;
import com.redhat.exhort.api.v4.DependencyReport;
import org.jboss.tools.intellij.componentanalysis.CAAnnotator;
import org.jboss.tools.intellij.settings.ApiSettingsState;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/image/ApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.openapi.extensions.PluginId;
import com.redhat.exhort.Api;
import com.redhat.exhort.api.AnalysisReport;
import com.redhat.exhort.api.v4.AnalysisReport;
import com.redhat.exhort.image.ImageRef;
import com.redhat.exhort.impl.ExhortApi;
import org.jboss.tools.intellij.exhort.TelemetryService;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/jboss/tools/intellij/image/DockerfileAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.serviceContainer.AlreadyDisposedException;
import com.redhat.exhort.api.AnalysisReport;
import com.redhat.exhort.api.DependencyReport;
import com.redhat.exhort.api.ProviderReport;
import com.redhat.exhort.api.Severity;
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.Severity;
import com.redhat.exhort.api.v4.Source;
import com.redhat.exhort.image.ImageRef;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/image/ImageCacheService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.github.benmanes.caffeine.cache.Caffeine;
import com.intellij.openapi.components.Service;
import com.intellij.openapi.project.Project;
import com.redhat.exhort.api.AnalysisReport;
import com.redhat.exhort.api.v4.AnalysisReport;
import com.redhat.exhort.image.ImageRef;

import java.util.Collection;
Expand Down
Loading