From b1e1b46ec1d8b6a463e650ac90b5edf11b90be89 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Thu, 10 Apr 2025 00:11:53 +0300 Subject: [PATCH 1/5] update tycho version to 2.7.0 + code adjustments --- .mvn/extensions.xml | 10 +++++----- .../ide/eclipse/configuration/CliDriverWrapper.java | 2 +- .../eclipse/configuration/XrayGlobalConfiguration.java | 9 ++++++++- .../java/com/jfrog/ide/eclipse/scan/ScanManager.java | 3 +-- pom.xml | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) 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/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..511e425 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,10 @@ public boolean performOk() { CliDriverWrapper.HOME_PATH.toFile(), configEnv ); + if (!configResults.getErr().isBlank()) { + // throw exception and pop up a message error + 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 From 4a0150cdb13aaafbf4a263a12db3624dfceaf199 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Mon, 14 Apr 2025 10:42:13 +0300 Subject: [PATCH 2/5] fix comments from CR --- bundle/pom.xml | 6 +++--- .../ide/eclipse/configuration/XrayGlobalConfiguration.java | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index e222ea5..11e0bdf 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -8,7 +8,7 @@ com.jfrog.ide.eclipse com.jfrog.ide.eclipse.parent - 1.2.0 + 2.0.0 @@ -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/XrayGlobalConfiguration.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java index 511e425..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 @@ -82,7 +82,6 @@ public boolean performOk() { configEnv ); if (!configResults.getErr().isBlank()) { - // throw exception and pop up a message error throw new Exception(configResults.getErr()); } } catch (Exception e) { From 1bd83d959a197baf0f299c1a6e88d36005afb2b6 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Mon, 14 Apr 2025 10:50:42 +0300 Subject: [PATCH 3/5] fix --- releng/update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/update-site/pom.xml b/releng/update-site/pom.xml index bffc9c7..671cec3 100644 --- a/releng/update-site/pom.xml +++ b/releng/update-site/pom.xml @@ -8,7 +8,7 @@ com.jfrog.ide.eclipse.releng com.jfrog.ide.eclipse.releng - 1.2.0 + 2.0.0 From 2097485c144f5cac38aef999a22387f9322fe021 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Mon, 14 Apr 2025 10:52:00 +0300 Subject: [PATCH 4/5] fix --- releng/update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/update-site/pom.xml b/releng/update-site/pom.xml index 671cec3..bffc9c7 100644 --- a/releng/update-site/pom.xml +++ b/releng/update-site/pom.xml @@ -8,7 +8,7 @@ com.jfrog.ide.eclipse.releng com.jfrog.ide.eclipse.releng - 2.0.0 + 1.2.0 From e46aba327dd58d2c04492764aed816f4e1284526 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Mon, 14 Apr 2025 10:52:53 +0300 Subject: [PATCH 5/5] version fix --- bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index 11e0bdf..9178686 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -8,7 +8,7 @@ com.jfrog.ide.eclipse com.jfrog.ide.eclipse.parent - 2.0.0 + 1.2.0