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
4 changes: 2 additions & 2 deletions bundle/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand All @@ -13,4 +13,4 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/ide-plugins-common.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
</classpath>
6 changes: 3 additions & 3 deletions bundle/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=17
4 changes: 2 additions & 2 deletions bundle/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
Bundle-Name: XRay Plugin
Bundle-SymbolicName: com.jfrog.ide.eclipse;singleton:=true
Bundle-Version: 1.2.0
nEnvironment: JavaSE-1.8
nEnvironment: JavaSE-17
Import-Package: javax.annotation
Automatic-Module-Name: org.jfrog.plugin.rcp
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.ui;bundle-version="3.114.0",
org.eclipse.core.runtime;bundle-version="3.16.0",
org.eclipse.m2e.maven.runtime;bundle-version="1.13.0",
Expand Down
2 changes: 1 addition & 1 deletion bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</repositories>

<properties>
<ide-plugins-common-version>1.6.1</ide-plugins-common-version>
<ide-plugins-common-version>2.4.0</ide-plugins-common-version>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void widgetSelected(SelectionEvent e) {
Xray xrayClient = createXrayClient();
Version xrayVersion = xrayClient.system().version();

if (!XrayConnectionUtils.isXrayVersionSupported(xrayVersion)) {
if (!XrayConnectionUtils.isSupportedInXrayVersion(xrayVersion)) {
connectionResults.setText(XrayConnectionUtils.Results.unsupported(xrayVersion));
} else {
Pair<Boolean, String> testComponentPermissionRes = XrayConnectionUtils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.preferences.ScopedPreferenceStore;

import com.jfrog.ide.eclipse.scan.ScanManagersFactory;
import com.jfrog.ide.eclipse.ui.ComponentDetails;
import com.jfrog.ide.eclipse.ui.issues.ComponentIssueDetails;
import com.jfrog.ide.eclipse.ui.licenses.ComponentLicenseDetails;
Expand Down Expand Up @@ -44,6 +43,7 @@ public void createFieldEditors() {

@Override
public boolean performOk() {
// TODO: This code runs when clicking the 'Apply' button in the settings panel. Implement server configuration using CliDriver here
super.performOk();
if (!XrayServerConfigImpl.getInstance().areCredentialsSet()) {
return true;
Expand All @@ -57,7 +57,7 @@ public boolean performOk() {
}
}
if (doQuickScan) {
ScanManagersFactory.getInstance().startScan(getShell().getParent(), true);
// TODO: run a scan using the ScanManager
}
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
@SuppressWarnings("restriction")
public class XrayServerConfigImpl implements ServerConfig {
// TODO: adjust implementation for configuring server using JfrogCliDriver

private static XrayServerConfigImpl instance;
private IPreferencesService service = Platform.getPreferencesService();
Expand Down Expand Up @@ -107,4 +108,34 @@ public boolean isInsecureTls() {
return false;
}

@Override
public String getAccessToken() {
// TODO Auto-generated method stub
return null;
}

@Override
public String getExternalResourcesRepo() {
// TODO Auto-generated method stub
return null;
}

@Override
public PolicyType getPolicyType() {
// TODO Auto-generated method stub
return null;
}

@Override
public String getProject() {
// TODO Auto-generated method stub
return null;
}

@Override
public String getWatches() {
// TODO Auto-generated method stub
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,16 @@ public ProgressIndicatorImpl(String name, IProgressMonitor progressMonitor) {
public void setFraction(double fraction) {
progressMonitor.worked((int) (fraction * TOTAL_WORK));
}

@Override
public void setIndeterminate(boolean arg0) {
// TODO Auto-generated method stub

}

@Override
public void setText(String arg0) {
// TODO Auto-generated method stub

}
}
195 changes: 0 additions & 195 deletions bundle/src/main/java/com/jfrog/ide/eclipse/scan/GradleScanManager.java

This file was deleted.

Loading