Skip to content

Update dependencies - plugins common to v2.4.3 and tycho to v2.7.0 #36

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
kerenr-jfrog merged 5 commits into from
Apr 15, 2025
Merged

Update dependencies - plugins common to v2.4.3 and tycho to v2.7.0 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1e1b46
update tycho version to 2.7.0 + code adjustments
kerenr-jfrog Apr 9, 2025
4a0150c
fix comments from CR
kerenr-jfrog Apr 14, 2025
1bd83d9
fix
kerenr-jfrog Apr 14, 2025
2097485
fix
kerenr-jfrog Apr 14, 2025
e46aba3
version fix
kerenr-jfrog Apr 14, 2025
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
10 changes: 5 additions & 5 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<extensions>
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>1.3.0</version>
</extension>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.0</version>
</extension>
</extensions>
4 changes: 2 additions & 2 deletions bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</repositories>

<properties>
<ide-plugins-common-version>2.4.1</ide-plugins-common-version>
<ide-plugins-common-version>2.4.3</ide-plugins-common-version>
</properties>

<build>
Expand Down Expand Up @@ -86,4 +86,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 7 additions & 1 deletion bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<tycho.version>3.0.0</tycho.version>
<tycho.version>2.7.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down