diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 5de0b59..3bbb156 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ - - org.eclipse.tycho.extras - tycho-pomless - 1.3.0 - + + org.eclipse.tycho + tycho-build + 2.7.0 + diff --git a/bundle/pom.xml b/bundle/pom.xml index e222ea5..9178686 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -27,7 +27,7 @@ - 2.4.1 + 2.4.3 @@ -86,4 +86,4 @@ - + \ No newline at end of file diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java index 5af09da..88290a5 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java @@ -30,7 +30,7 @@ private CliDriverWrapper() { showCliError("An error occurred while creating the JFrog Eclipse plugin directory:",e); } // Initialize the cliDriver and download CLI if needed - this.cliDriver = new JfrogCliDriver(null, Logger.getInstance()); + this.cliDriver = new JfrogCliDriver(null, HOME_PATH.toString(), Logger.getInstance()); try { this.cliDriver.downloadCliIfNeeded(HOME_PATH.toString(), CLI_VERSION); } catch (IOException e) { diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java index 2cbaf45..4ae81dc 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java @@ -14,7 +14,9 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.preferences.ScopedPreferenceStore; +import org.jfrog.build.extractor.executor.CommandResults; +import com.jfrog.ide.common.configuration.JfrogCliDriver; import com.jfrog.ide.eclipse.log.Logger; import com.jfrog.ide.eclipse.scheduling.CliJob; import com.jfrog.ide.eclipse.ui.ComponentDetails; @@ -68,7 +70,8 @@ public boolean performOk() { // Define the runnable to execute the CLI config command ICoreRunnable runnableServerConfig = monitor -> { try { - CliDriverWrapper.getInstance().getCliDriver().addCliServerConfig( + JfrogCliDriver cliDriver = CliDriverWrapper.getInstance().getCliDriver(); + CommandResults configResults = cliDriver.addCliServerConfig( XrayServerConfigImpl.getInstance().getXrayUrl(), XrayServerConfigImpl.getInstance().getArtifactoryUrl(), CliDriverWrapper.CLIENT_ID_SERVER, @@ -78,6 +81,9 @@ public boolean performOk() { CliDriverWrapper.HOME_PATH.toFile(), configEnv ); + if (!configResults.getErr().isBlank()) { + throw new Exception(configResults.getErr()); + } } catch (Exception e) { CliDriverWrapper.getInstance().showCliError("An error occurred while setting up the server connection:", e); } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java b/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java index 508dacc..6eca61c 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java @@ -157,10 +157,9 @@ public void run(IProgressMonitor monitor) throws CoreException { return; } - log.info(String.format("Performing scan on: %s", project.getName())); - try { if (project.isOpen()) { + log.info(String.format("Performing scan on: %s", project.getName())); IPath projectPath = project.getLocation(); CommandResults auditResults = cliDriver.runCliAudit(new File(projectPath.toString()), null, CliDriverWrapper.CLIENT_ID_SERVER, null, envVars); if (!auditResults.isOk()) { diff --git a/pom.xml b/pom.xml index d6d4d73..ca3ebf0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom - 3.0.0 + 2.7.0 UTF-8