Skip to content
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.

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

SLE-1046: Remove unused dependencies / update used ones #800

Merged
merged 4 commits into from
Jan 22, 2025
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
1 change: 0 additions & 1 deletion its/org.sonarlint.eclipse.its.cdt/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Require-Bundle: org.eclipse.jdt.core,
org.apache.commons.commons-io;bundle-version="2.16.1",
org.awaitility;bundle-version="4.2.2",
org.hamcrest;bundle-version="2.2.0",
minimal-json;bundle-version="0.9.5",
org.apache.commons.exec;bundle-version="1.3.0",
com.google.protobuf;bundle-version="3.25.1",
org.sonarlint.eclipse.its.shared
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ Require-Bundle: org.eclipse.jdt.core,
org.sonarsource.orchestrator.sonar-orchestrator;bundle-version="3.43.0",
org.sonarsource.orchestrator.sonar-orchestrator-junit4;bundle-version="3.43.0",
org.sonarsource.sonarqube.sonar-ws;bundle-version="6.7.0",
minimal-json;bundle-version="0.9.5",
org.apache.commons.exec;bundle-version="1.3.0",
com.google.guava;bundle-version="18.0.0",
com.google.protobuf;bundle-version="3.25.1",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Require-Bundle: org.eclipse.jdt.core,
org.apache.commons.commons-io;bundle-version="2.16.1",
org.awaitility;bundle-version="4.2.2",
org.hamcrest;bundle-version="2.2.0",
minimal-json;bundle-version="0.9.5",
org.apache.commons.exec;bundle-version="1.3.0",
com.google.protobuf;bundle-version="3.25.1",
org.sonarlint.eclipse.its.shared
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<feature id="org.eclipse.cdt"/>
<feature id="org.eclipse.wst.jsdt.feature"/>
<feature id="org.eclipse.rse"/>
<feature id="org.eclipse.php"/>
<feature id="org.eclipse.mylyn.commons"/>
<feature id="org.eclipse.buildship"/>
<feature id="org.sonarlint.eclipse.feature"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<feature id="org.eclipse.cdt"/>
<feature id="org.eclipse.wst.jsdt.feature"/>
<feature id="org.eclipse.rse"/>
<feature id="org.eclipse.php"/>
<feature id="org.eclipse.mylyn.commons"/>
<feature id="org.eclipse.buildship"/>
<feature id="org.sonarlint.eclipse.feature"/>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.reddeer.common.wait.TimePeriod;
import org.eclipse.reddeer.common.wait.WaitUntil;
import org.eclipse.reddeer.common.wait.WaitWhile;
import org.eclipse.reddeer.eclipse.condition.ProjectExists;
import org.eclipse.reddeer.eclipse.jdt.ui.packageview.PackageExplorerPart;
import org.eclipse.reddeer.eclipse.ui.dialogs.PropertyDialog;
Expand All @@ -45,26 +43,22 @@
import org.eclipse.reddeer.swt.impl.link.DefaultLink;
import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
import org.eclipse.reddeer.workbench.impl.editor.DefaultEditor;
import org.eclipse.reddeer.workbench.impl.editor.TextEditor;
import org.eclipse.reddeer.workbench.ui.dialogs.WorkbenchPreferenceDialog;
import org.hamcrest.CoreMatchers;
import org.hamcrest.core.StringContains;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.sonarlint.eclipse.its.shared.AbstractSonarLintTest;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.ConfirmManualAnalysisDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.EnhancedWithConnectedModeInformationDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.OnTheFlyViewIsEmpty;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.ConfirmManualAnalysisDialog;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.EnhancedWithConnectedModeInformationDialog;
import org.sonarlint.eclipse.its.shared.reddeer.perspectives.PhpPerspective;
import org.sonarlint.eclipse.its.shared.reddeer.preferences.GeneralWorkspaceBuildPreferences;
import org.sonarlint.eclipse.its.shared.reddeer.preferences.SonarLintPreferences;
import org.sonarlint.eclipse.its.shared.reddeer.preferences.SonarLintProperties;
Expand Down Expand Up @@ -458,11 +452,8 @@ public void shouldAnalysePython() {

// Need PDT
@Test
@Category(RequiresExtraDependency.class)
public void shouldAnalysePHP() {
new PhpPerspective().open();
var rootProject = importExistingProjectIntoWorkspace("php", "php");
new WaitWhile(new JobIsRunning(StringContains.containsString("DLTK Indexing")), TimePeriod.LONG);

openFileAndWaitForAnalysisCompletion(rootProject.getResource("foo.php"));

Expand Down Expand Up @@ -505,7 +496,6 @@ public void shouldAnalyseLinkedFile() throws IOException {

// Need RSE
@Test
@Category(RequiresExtraDependency.class)
public void shouldAnalyseVirtualProject() throws Exception {
// INFO: It is flaky when running on top of the oldest Eclipse version but works fine in the other test cases,
// therefore it should be skipped in that particular situation!
Expand Down
2 changes: 1 addition & 1 deletion its/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<jdk.min.version>11</jdk.min.version>

<!-- Tycho plug-ins -->
<tycho.version>4.0.8</tycho.version>
<tycho.version>4.0.10</tycho.version>

<!-- Global properties -->
<target.platform>latest</target.platform>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class MarkerUtilsTest extends SonarTestCase {
public static void importProject() throws Exception {
project = importEclipseProject("SimpleProject");
// Configure the project
SonarLintCorePlugin.getInstance().getProjectConfigManager().load(new ProjectScope(project), "A Project");
SonarLintCorePlugin.getInstance().getProjectConfigManager().load(new ProjectScope(project));
}

/** While we couldn't test this via integration tests, this must do it otherwise promotion failed due to SQ QG failing */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void settings_are_written_to_disk() throws IOException, CoreException, In
var project = importEclipseProject("SimpleProject");
var projectScope = new ProjectScope(project);
assertThat(projectScope.getLocation().append("org.sonarlint.eclipse.core.prefs").toFile()).doesNotExist();
var configuration = SonarLintCorePlugin.getInstance().getProjectConfigManager().load(projectScope, "SimpleProject");
var configuration = SonarLintCorePlugin.getInstance().getProjectConfigManager().load(projectScope);
configuration.setAutoEnabled(false);
configuration.setBindingSuggestionsDisabled(true);
configuration.setProjectBinding(new EclipseProjectBinding("myServer", "myProjectKey"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static synchronized ConnectionManager getConnectionManager() {
}

public static SonarLintProjectConfiguration loadConfig(ISonarLintProject project) {
return getInstance().getProjectConfigManager().load(project.getScopeContext(), project.getName());
return getInstance().getProjectConfigManager().load(project.getScopeContext());
}

public static void saveConfig(ISonarLintProject project, SonarLintProjectConfiguration config) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void registerPreferenceChangeListenerForBindingProperties(ISonarLi
});
}

public SonarLintProjectConfiguration load(IScopeContext projectScope, String projectName) {
public SonarLintProjectConfiguration load(IScopeContext projectScope) {
var projectNode = projectScope.getNode(SonarLintCorePlugin.PLUGIN_ID);
var projectConfig = new SonarLintProjectConfiguration();
if (projectNode == null) {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
<jdk.min.version>11</jdk.min.version>

<!-- Maven plug-ins -->
<jarsigner.version>3.0.0</jarsigner.version>
<jarsigner.version>3.1.0</jarsigner.version>
<toolchains.version>3.2.0</toolchains.version>
<os.version>1.7.1</os.version>

<!-- Tycho plug-ins -->
<tycho.version>4.0.8</tycho.version>
<tycho.version>4.0.10</tycho.version>

<!-- Sloop embedded CLI version for fragment projects -->
<sloop.version>10.13.0.79996</sloop.version>
Expand Down
4 changes: 2 additions & 2 deletions target-platforms/commons-build.target
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.13.0</version>
<version>5.15.2</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions target-platforms/commons-its.target
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<version>2.18.0</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.27.3</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/latest-java-17_e431.target
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<unit id="org.eclipse.platform.ide" version="0.0.0" />
<unit id="org.eclipse.rse.feature.group" version="0.0.0" />
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="0.0.0" />
<unit id="org.eclipse.php.feature.group" version="0.0.0" />
<unit id="org.eclipse.pde.feature.group" version="0.0.0" />
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0" />
<!-- Needed to build the test environment -->
Expand Down
1 change: 0 additions & 1 deletion target-platforms/latest-java-21.target
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<unit id="org.eclipse.platform.ide" version="0.0.0" />
<unit id="org.eclipse.rse.feature.group" version="0.0.0" />
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="0.0.0" />
<unit id="org.eclipse.php.feature.group" version="0.0.0" />
<unit id="org.eclipse.pde.feature.group" version="0.0.0" />
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0" />
<!-- Needed to build the test environment -->
Expand Down
1 change: 0 additions & 1 deletion target-platforms/oldest-java-11_e417.target
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<unit id="org.eclipse.rse.feature.group" version="0.0.0" />
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="0.0.0" />
<unit id="org.eclipse.mylyn.commons.feature.group" version="0.0.0" />
<unit id="org.eclipse.php.feature.group" version="0.0.0" />
<!-- Needed to build the test environment -->
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
<repository location="https://download.eclipse.org/releases/2020-09/" />
Expand Down
Loading