Use SLCORE 10.0.3 for bugfix release

SonarSource · Apr 2, 2024 · a6bbac1 · a6bbac1
1 parent f4ae7c3
commit a6bbac1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.sonarsource.sonarlint.ls</groupId>
   <artifactId>sonarlint-language-server</artifactId>
-  <version>3.5-SNAPSHOT</version>
+  <version>3.4.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>SonarLint Language Server</name>
   <description>SonarLint Language Server</description>
@@ -24,7 +24,7 @@
 
   <properties>
     <jdk.min.version>17</jdk.min.version>
-    <sonarlint.core.version>10.1.0.77276</sonarlint.core.version>
+    <sonarlint.core.version>10.0.3.77436</sonarlint.core.version>
     <!-- Version used by Xodus -->
     <kotlin.version>1.6.10</kotlin.version>
     <!-- analyzers used for tests -->

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java b/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java
@@ -245,7 +245,6 @@ public class SonarLintLanguageServer implements SonarLintExtendedLanguageServer,
       client, globalLogOutput, backendServiceFacade, openNotebooksCache);
     vsCodeClient.setBindingManager(bindingManager);
     this.telemetry = new SonarLintTelemetry(backendServiceFacade, globalLogOutput);
-    backendServiceFacade.setTelemetry(this.telemetry);
     this.settingsManager.addListener(telemetry);
     this.settingsManager.addListener((WorkspaceSettingsChangeListener) bindingManager);
     this.settingsManager.addListener((WorkspaceFolderSettingsChangeListener) bindingManager);

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java b/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java
@@ -51,7 +51,6 @@
 import org.sonarsource.sonarlint.ls.log.LanguageClientLogger;
 import org.sonarsource.sonarlint.ls.settings.ServerConnectionSettings;
 import org.sonarsource.sonarlint.ls.settings.SettingsManager;
-import org.sonarsource.sonarlint.ls.telemetry.SonarLintTelemetry;
 import org.sonarsource.sonarlint.ls.telemetry.TelemetryInitParams;
 
 public class BackendServiceFacade {
@@ -67,7 +66,6 @@ public class BackendServiceFacade {
   private SettingsManager settingsManager;
   private TelemetryInitParams telemetryInitParams;
   private final CountDownLatch initLatch = new CountDownLatch(1);
-  private SonarLintTelemetry telemetry;
 
   public BackendServiceFacade(SonarLintRpcClientDelegate rpcClient, LanguageClientLogger lsLogOutput, SonarLintExtendedLanguageClient client) {
     this.lsLogOutput = lsLogOutput;
@@ -127,7 +125,6 @@ private void initOnce(Map<String, ServerConnectionSettings> connections) {
   }
 
   private InitializeParams toInitParams(BackendInitParams initParams) {
-    var telemetryEnabled = telemetry != null && telemetry.enabled();
     return new InitializeParams(
       new ClientConstantInfoDto("Visual Studio Code", initParams.getUserAgent()),
       new TelemetryClientConstantAttributesDto(initParams.getTelemetryProductKey(),
@@ -138,7 +135,7 @@ private InitializeParams toInitParams(BackendInitParams initParams) {
       getHttpConfiguration(),
       getSonarCloudAlternativeEnvironment(),
       new FeatureFlagsDto(true, true, true,
-        true, initParams.isEnableSecurityHotspots(), true, true, true, telemetryEnabled),
+        true, initParams.isEnableSecurityHotspots(), true, true, true),
       initParams.getStorageRoot(),
       Path.of(initParams.getSonarlintUserHome()),
       initParams.getEmbeddedPluginPaths(),
@@ -221,8 +218,4 @@ public TelemetryInitParams getTelemetryInitParams() {
   public CountDownLatch getInitLatch() {
     return initLatch;
   }
-
-  public void setTelemetry(SonarLintTelemetry telemetry) {
-    this.telemetry = telemetry;
-  }
 }