Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,22 @@ repositories {
maven {
url "https://releases.jfrog.io/artifactory/oss-snapshots"
}
maven {
url "https://cache-redirector.jetbrains.com/intellij-dependencies"
}
}

def buildInfoVersion = '2.41.13'
def idePluginsCommonVersion = '2.3.7'
def buildInfoVersion = '2.43.6'
def idePluginsCommonVersion = '2.4.4'
// Updated to 2.17.3 for security fixes - compatible with Java 8+
def jacksonVersion = '2.17.3'

dependencies {
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: jacksonVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor', version: buildInfoVersion
implementation group: 'com.jfrog.ide', name: 'ide-plugins-common', version: idePluginsCommonVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-client', version: buildInfoVersion
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.3'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-api', version: buildInfoVersion
implementation group: 'com.jfrog.xray.client', name: 'xray-client-java', version: '0.14.1'
implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.net.PasswordAuthentication;
import java.net.Proxy;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;

Expand Down Expand Up @@ -494,7 +495,7 @@ public void readMissingConfFromEnv() {
* @return true if connection details loaded from JFrog CLI default server.
*/
public boolean readConnectionDetailsFromJfrogCli() throws IOException {
JfrogCliDriver driver = new JfrogCliDriver(EnvironmentUtil.getEnvironmentMap());
JfrogCliDriver driver = new JfrogCliDriver(new HashMap<>(EnvironmentUtil.getEnvironmentMap()), null);
if (!driver.isJfrogCliInstalled()) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static IssuePage convertFileIssueToIssuePage(FileIssueNode fileIssueNodeN
public static IssuePage convertSastIssueToSastIssuePage(SastIssueNode sastIssueNode) {
return new SastIssuePage(convertFileIssueToIssuePage(sastIssueNode))
.setAnalysisSteps(convertCodeFlowsToLocations(sastIssueNode.getCodeFlows()))
.setRuleID(sastIssueNode.getRuleID());
.setRuleID(sastIssueNode.getRuleId());
}

private static Location[] convertCodeFlowsToLocations(FindingInfo[][] codeFlows) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public void testReadConnectionDetailsFromJfrogCli() throws IOException, Interrup

// Config JFrog CLI
if (cliParameters != null) {
JfrogCliDriver jfrogCliDriver = new JfrogCliDriver(envVars);
jfrogCliDriver.runCommand(null, cliParameters, new ArrayList<>(), null);
JfrogCliDriver jfrogCliDriver = new JfrogCliDriver(envVars, null);
jfrogCliDriver.runCommand(null, envVars, cliParameters, new ArrayList<>(), null, null);
}

// Check results
Expand Down
Loading