From 4fa5e7a306adbfcd652f9ba2b14a9c0168dba6ad Mon Sep 17 00:00:00 2001
From: Dorian Burihabwa
 <75226315+dorian-burihabwa-sonarsource@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:15:47 +0100
Subject: [PATCH 1/6] SONARSCALA-36 Bump orchestrator to version 5.1.0.2254
 (#36)

---
 .../test/java/org/sonarsource/slang/SonarLintTest.java |  8 ++++----
 .../src/test/java/org/sonarsource/slang/TestBase.java  |  4 ++--
 .../src/test/java/org/sonarsource/slang/Tests.java     | 10 +++++-----
 .../java/org/sonarsource/slang/SlangRulingTest.java    | 10 +++++-----
 settings.gradle                                        |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java b/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
index 9ffed16..7d34504 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
@@ -16,8 +16,8 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.OrchestratorBuilder;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
 import com.sonar.orchestrator.locator.Locators;
 import java.io.File;
 import java.io.IOException;
@@ -63,9 +63,9 @@ public class SonarLintTest {
   @BeforeClass
   public static void prepare() throws Exception {
     // Orchestrator is used only to retrieve plugin artifacts from filesystem or maven
-    OrchestratorBuilder orchestratorBuilder = Orchestrator.builderEnv();
+    OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv();
     Tests.addLanguagePlugins(orchestratorBuilder);
-    Orchestrator orchestrator = orchestratorBuilder
+    OrchestratorRule orchestrator = orchestratorBuilder
       .useDefaultAdminCredentialsForBuilds(true)
       .setSonarVersion(System.getProperty(Tests.SQ_VERSION_PROPERTY, Tests.DEFAULT_SQ_VERSION))
       .build();
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java b/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java
index bd1b742..ed6dbdb 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java
@@ -16,7 +16,7 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import com.sonar.orchestrator.build.SonarScanner;
 import java.io.File;
 import java.util.Arrays;
@@ -41,7 +41,7 @@
 public abstract class TestBase {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorRule ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   protected SonarScanner getSonarScanner(String projectKey, String directoryToScan, String languageKey) {
     return getSonarScanner(projectKey, directoryToScan, languageKey, null);
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/Tests.java b/its/plugin/src/test/java/org/sonarsource/slang/Tests.java
index be9a057..e4ece41 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/Tests.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/Tests.java
@@ -16,8 +16,8 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.OrchestratorBuilder;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.Location;
 import com.sonar.orchestrator.locator.MavenLocation;
@@ -46,10 +46,10 @@ public class Tests {
   private static final Set<String> LANGUAGES = new HashSet<>(Collections.singletonList("scala"));
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR;
+  public static final OrchestratorRule ORCHESTRATOR;
 
   static {
-    OrchestratorBuilder orchestratorBuilder = Orchestrator.builderEnv();
+    OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv();
     addLanguagePlugins(orchestratorBuilder);
     ORCHESTRATOR = orchestratorBuilder
       .useDefaultAdminCredentialsForBuilds(true)
@@ -59,7 +59,7 @@ public class Tests {
       .build();
   }
 
-  static void addLanguagePlugins(OrchestratorBuilder builder) {
+  static void addLanguagePlugins(OrchestratorRuleBuilder builder) {
     String slangVersion = System.getProperty("slangVersion");
 
     LANGUAGES.forEach(language -> {
diff --git a/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java b/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
index 723766e..c3eecba 100644
--- a/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
+++ b/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
@@ -16,9 +16,9 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.Location;
 import com.sonar.orchestrator.locator.MavenLocation;
@@ -43,11 +43,11 @@ public class SlangRulingTest {
   private static final String SQ_VERSION_PROPERTY = "sonar.runtimeVersion";
   private static final String DEFAULT_SQ_VERSION = "LATEST_RELEASE";
 
-  private static Orchestrator orchestrator;
+  private static OrchestratorRule orchestrator;
   private static boolean keepSonarqubeRunning = "true".equals(System.getProperty("keepSonarqubeRunning"));
   @BeforeClass
   public static void setUp() {
-    OrchestratorBuilder builder = Orchestrator.builderEnv()
+    OrchestratorRuleBuilder builder = OrchestratorRule.builderEnv()
       .useDefaultAdminCredentialsForBuilds(true)
       .setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
       .addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.10.0.2181"));
@@ -66,7 +66,7 @@ public static void setUp() {
     orchestrator.getServer().restoreProfile(FileLocation.of(scalaProfile));
   }
 
-  private static void addLanguagePlugins(OrchestratorBuilder builder) {
+  private static void addLanguagePlugins(OrchestratorRuleBuilder builder) {
     String slangVersion = System.getProperty("slangVersion");
 
     Location pluginLocation;
diff --git a/settings.gradle b/settings.gradle
index a947427..f519ca7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ dependencyResolutionManagement {
     def analyzerCommonsVersion = '2.16.0.3141'
     def pluginApiVersion = '10.10.0.2391'
     def sonarqubeVersion = '10.0.0.68432'
-    def orchestratorVersion = '3.42.0.312'
+    def orchestratorVersion = '5.1.0.2254'
     def sonarlintVersion = '9.0.0.74282'
     // slf4j is provided by SQ, SC or SL, should be aligned with sonar-plugin-api
     def slf4jApiVersion = '1.7.30'
@@ -30,7 +30,7 @@ dependencyResolutionManagement {
         testLibs {
             library("sonar-plugin-api-test-fixtures", "org.sonarsource.api.plugin", "sonar-plugin-api-test-fixtures").version(pluginApiVersion)
             library("sonar-plugin-api-impl", "org.sonarsource.sonarqube", "sonar-plugin-api-impl").version(sonarqubeVersion)
-            library("sonar-orchestrator", "org.sonarsource.orchestrator", "sonar-orchestrator").version(orchestratorVersion)
+            library("sonar-orchestrator", "org.sonarsource.orchestrator", "sonar-orchestrator-junit4").version(orchestratorVersion)
             library("sonarlint-core", "org.sonarsource.sonarlint.core", "sonarlint-core").version(sonarlintVersion)
             library("sonar-ws", "org.sonarsource.sonarqube", "sonar-ws").version(sonarqubeVersion)
             library("slang-antlr", "org.sonarsource.slang", "slang-antlr").version(slangDependenciesVersion)

From ee41df4ebd2ff67ba01fbec146dd82b5671a5502 Mon Sep 17 00:00:00 2001
From: erwan-serandour <erwan.serandour@sonarsource.com>
Date: Mon, 6 Jan 2025 17:45:59 +0100
Subject: [PATCH 2/6] SONARSCALA-41 Happy new year 2025 (#39)

---
 README.md                                                       | 2 +-
 .../src/test/java/org/sonarsource/slang/CoverageTest.java       | 2 +-
 .../src/test/java/org/sonarsource/slang/DuplicationsTest.java   | 2 +-
 .../src/test/java/org/sonarsource/slang/ExternalReportTest.java | 2 +-
 .../src/test/java/org/sonarsource/slang/MeasuresTest.java       | 2 +-
 its/plugin/src/test/java/org/sonarsource/slang/NoSonarTest.java | 2 +-
 .../src/test/java/org/sonarsource/slang/SonarLintTest.java      | 2 +-
 its/plugin/src/test/java/org/sonarsource/slang/TestBase.java    | 2 +-
 its/plugin/src/test/java/org/sonarsource/slang/Tests.java       | 2 +-
 .../src/test/java/org/sonarsource/slang/SlangRulingTest.java    | 2 +-
 .../scala/checks/AllBranchesIdenticalScalaCheck.java            | 2 +-
 .../org/sonarsource/scala/checks/DuplicateBranchScalaCheck.java | 2 +-
 .../java/org/sonarsource/scala/checks/PatternMatchHelper.java   | 2 +-
 .../sonarsource/scala/checks/UnusedPrivateMethodScalaCheck.java | 2 +-
 .../main/java/org/sonarsource/scala/checks/package-info.java    | 2 +-
 .../scalastyle/ScalastyleFamilyRulesDefinition.java             | 2 +-
 .../scala/externalreport/scalastyle/ScalastyleFamilySensor.java | 2 +-
 .../externalreport/scalastyle/ScalastyleRulesDefinition.java    | 2 +-
 .../scala/externalreport/scalastyle/ScalastyleSensor.java       | 2 +-
 .../externalreport/scalastyle/ScalastyleXmlReportReader.java    | 2 +-
 .../scala/externalreport/scalastyle/package-info.java           | 2 +-
 .../externalreport/scapegoat/ScapegoatRulesDefinition.java      | 2 +-
 .../scala/externalreport/scapegoat/ScapegoatSensor.java         | 2 +-
 .../scala/externalreport/scapegoat/package-info.java            | 2 +-
 .../main/java/org/sonarsource/scala/plugin/ScalaCheckList.java  | 2 +-
 .../main/java/org/sonarsource/scala/plugin/ScalaLanguage.java   | 2 +-
 .../src/main/java/org/sonarsource/scala/plugin/ScalaPlugin.java | 2 +-
 .../org/sonarsource/scala/plugin/ScalaProfileDefinition.java    | 2 +-
 .../java/org/sonarsource/scala/plugin/ScalaRulesDefinition.java | 2 +-
 .../src/main/java/org/sonarsource/scala/plugin/ScalaSensor.java | 2 +-
 .../main/java/org/sonarsource/scala/plugin/ScoverageSensor.java | 2 +-
 .../main/java/org/sonarsource/scala/plugin/package-info.java    | 2 +-
 .../org/sonarsource/scala/converter/ScalaCodeVerifier.scala     | 2 +-
 .../scala/org/sonarsource/scala/converter/ScalaConverter.scala  | 2 +-
 .../src/test/java/org/sonarsource/scala/ast/ScalaASTTest.java   | 2 +-
 .../scala/checks/AllBranchesIdenticalScalaCheckTest.java        | 2 +-
 .../sonarsource/scala/checks/DuplicateBranchScalaCheckTest.java | 2 +-
 .../test/java/org/sonarsource/scala/checks/ScalaVerifier.java   | 2 +-
 .../scala/checks/UnusedPrivateMethodScalaCheckTest.java         | 2 +-
 .../scala/checks/VariableAndParameterNameScalaCheckTest.java    | 2 +-
 .../sonarsource/scala/converter/AbstractScalaConverterTest.java | 2 +-
 .../scala/converter/AssignmentExpressionTreeTest.java           | 2 +-
 .../sonarsource/scala/converter/BinaryExpressionTreeTest.java   | 2 +-
 .../sonarsource/scala/converter/ClassDeclarationTreeTest.java   | 2 +-
 .../sonarsource/scala/converter/ExceptionHandlingTreeTest.java  | 2 +-
 .../scala/converter/FunctionDeclarationTreeTest.java            | 2 +-
 .../org/sonarsource/scala/converter/IdentifierTreeTest.java     | 2 +-
 .../test/java/org/sonarsource/scala/converter/IfTreeTest.java   | 2 +-
 .../java/org/sonarsource/scala/converter/LiteralTreeTest.java   | 2 +-
 .../test/java/org/sonarsource/scala/converter/LoopTreeTest.java | 2 +-
 .../java/org/sonarsource/scala/converter/MatchTreeTest.java     | 2 +-
 .../java/org/sonarsource/scala/converter/ReturnTreeTest.java    | 2 +-
 .../java/org/sonarsource/scala/converter/Scala3TreeTest.java    | 2 +-
 .../org/sonarsource/scala/converter/ScalaCodeVerifierTest.java  | 2 +-
 .../org/sonarsource/scala/converter/ScalaConverterTest.java     | 2 +-
 .../java/org/sonarsource/scala/converter/ThrowTreeTest.java     | 2 +-
 .../sonarsource/scala/converter/UnaryExpressionTreeTest.java    | 2 +-
 .../scala/converter/VariableDeclarationTreeTest.java            | 2 +-
 .../scalastyle/ScalastyleRulesDefinitionTest.java               | 2 +-
 .../scala/externalreport/scalastyle/ScalastyleSensorTest.java   | 2 +-
 .../externalreport/scapegoat/ScapegoatRulesDefinitionTest.java  | 2 +-
 .../scala/externalreport/scapegoat/ScapegoatSensorTest.java     | 2 +-
 .../java/org/sonarsource/scala/plugin/ScalaCheckListTest.java   | 2 +-
 .../java/org/sonarsource/scala/plugin/ScalaLanguageTest.java    | 2 +-
 .../test/java/org/sonarsource/scala/plugin/ScalaPluginTest.java | 2 +-
 .../sonarsource/scala/plugin/ScalaProfileDefinitionTest.java    | 2 +-
 .../org/sonarsource/scala/plugin/ScalaRulesDefinitionTest.java  | 2 +-
 .../test/java/org/sonarsource/scala/plugin/ScalaSensorTest.java | 2 +-
 .../java/org/sonarsource/scala/plugin/ScoverageSensorTest.java  | 2 +-
 69 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/README.md b/README.md
index ea852ed..075a23c 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ For those files use a manual script like below to update the license. E.g., for
     `find . -type f -name "*.scala" -exec sed -i '' 's/2018-2023/2018-2024/' "{}" \;`
 
 ## License
-Copyright 2018-2024 SonarSource.
+Copyright 2018-2025 SonarSource.
 
 SonarQube analyzers released after November 29, 2024, including patch fixes for prior versions,
 are published under the [Sonar Source-Available License Version 1 (SSALv1)](LICENSE).
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/CoverageTest.java b/its/plugin/src/test/java/org/sonarsource/slang/CoverageTest.java
index 6aca1aa..8f953d8 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/CoverageTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/CoverageTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/DuplicationsTest.java b/its/plugin/src/test/java/org/sonarsource/slang/DuplicationsTest.java
index 82afbd0..4807cca 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/DuplicationsTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/DuplicationsTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/ExternalReportTest.java b/its/plugin/src/test/java/org/sonarsource/slang/ExternalReportTest.java
index 6b9753a..741005c 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/ExternalReportTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/ExternalReportTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java b/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java
index 9f125e1..daa21a7 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/NoSonarTest.java b/its/plugin/src/test/java/org/sonarsource/slang/NoSonarTest.java
index 50b649a..7dc798b 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/NoSonarTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/NoSonarTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java b/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
index 7d34504..b0fce1a 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/SonarLintTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java b/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java
index ed6dbdb..6b42d90 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/TestBase.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/plugin/src/test/java/org/sonarsource/slang/Tests.java b/its/plugin/src/test/java/org/sonarsource/slang/Tests.java
index e4ece41..f88a83a 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/Tests.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/Tests.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java b/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
index c3eecba..ce1b387 100644
--- a/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
+++ b/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheck.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheck.java
index 052190c..68b982b 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheck.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheck.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheck.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheck.java
index 2a8c62e..79b1442 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheck.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheck.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/PatternMatchHelper.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/PatternMatchHelper.java
index a43a45b..a7c35e2 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/PatternMatchHelper.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/PatternMatchHelper.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheck.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheck.java
index a1a2e9a..75ac00d 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheck.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheck.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/package-info.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/package-info.java
index ca9aeb6..1b6aac2 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/package-info.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/checks/package-info.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilyRulesDefinition.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilyRulesDefinition.java
index 40112ce..505d0a5 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilyRulesDefinition.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilyRulesDefinition.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilySensor.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilySensor.java
index 9f9a859..af549c3 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilySensor.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleFamilySensor.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinition.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinition.java
index 9f09c3d..921521a 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinition.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinition.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensor.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensor.java
index c70a10d..5f2b627 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensor.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensor.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleXmlReportReader.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleXmlReportReader.java
index de39190..16c7668 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleXmlReportReader.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleXmlReportReader.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/package-info.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/package-info.java
index 7a4cd92..99c5ba2 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/package-info.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scalastyle/package-info.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinition.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinition.java
index 0c3f1b1..fa179f3 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinition.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinition.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensor.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensor.java
index 7862cc8..d33ab9e 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensor.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensor.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/package-info.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/package-info.java
index 2e4639b..46dc1e7 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/package-info.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/externalreport/scapegoat/package-info.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaCheckList.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaCheckList.java
index 9f378ff..51e47cd 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaCheckList.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaCheckList.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaLanguage.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaLanguage.java
index 0c09a58..381e6fe 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaLanguage.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaLanguage.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaPlugin.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaPlugin.java
index 9c440bd..479aebf 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaPlugin.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaPlugin.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaProfileDefinition.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaProfileDefinition.java
index 9a0b595..8460acc 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaProfileDefinition.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaProfileDefinition.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaRulesDefinition.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaRulesDefinition.java
index ad82cfb..5d67a4d 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaRulesDefinition.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaRulesDefinition.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaSensor.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaSensor.java
index cff9a51..4b1031d 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaSensor.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScalaSensor.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScoverageSensor.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScoverageSensor.java
index f450f1d..19a1ba3 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScoverageSensor.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/ScoverageSensor.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/package-info.java b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/package-info.java
index 1e67ffd..2b09623 100644
--- a/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/package-info.java
+++ b/sonar-scala-plugin/src/main/java/org/sonarsource/scala/plugin/package-info.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaCodeVerifier.scala b/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaCodeVerifier.scala
index cd41375..7b82f20 100644
--- a/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaCodeVerifier.scala
+++ b/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaCodeVerifier.scala
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaConverter.scala b/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaConverter.scala
index 8aea587..a78ee50 100644
--- a/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaConverter.scala
+++ b/sonar-scala-plugin/src/main/scala/org/sonarsource/scala/converter/ScalaConverter.scala
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/ast/ScalaASTTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/ast/ScalaASTTest.java
index 41d594c..a794f7d 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/ast/ScalaASTTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/ast/ScalaASTTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheckTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheckTest.java
index 4dd0e98..e806c24 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheckTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/AllBranchesIdenticalScalaCheckTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheckTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheckTest.java
index a49e2b5..bff78af 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheckTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/DuplicateBranchScalaCheckTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/ScalaVerifier.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/ScalaVerifier.java
index 42866a4..fa2c9c1 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/ScalaVerifier.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/ScalaVerifier.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheckTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheckTest.java
index 8e03f86..368962d 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheckTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/UnusedPrivateMethodScalaCheckTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/VariableAndParameterNameScalaCheckTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/VariableAndParameterNameScalaCheckTest.java
index f437076..0d34839 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/VariableAndParameterNameScalaCheckTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/checks/VariableAndParameterNameScalaCheckTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AbstractScalaConverterTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AbstractScalaConverterTest.java
index 3f77b6e..ce4c652 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AbstractScalaConverterTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AbstractScalaConverterTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AssignmentExpressionTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AssignmentExpressionTreeTest.java
index c7740a3..5a795d9 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AssignmentExpressionTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/AssignmentExpressionTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/BinaryExpressionTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/BinaryExpressionTreeTest.java
index 67062de..0abd483 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/BinaryExpressionTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/BinaryExpressionTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ClassDeclarationTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ClassDeclarationTreeTest.java
index 5e05859..aea9805 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ClassDeclarationTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ClassDeclarationTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ExceptionHandlingTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ExceptionHandlingTreeTest.java
index 3a587aa..92a0974 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ExceptionHandlingTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ExceptionHandlingTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/FunctionDeclarationTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/FunctionDeclarationTreeTest.java
index 29ff298..c923b2b 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/FunctionDeclarationTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/FunctionDeclarationTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IdentifierTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IdentifierTreeTest.java
index 8f35792..9e73673 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IdentifierTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IdentifierTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IfTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IfTreeTest.java
index 134c882..7c3fd81 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IfTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/IfTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LiteralTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LiteralTreeTest.java
index 6ecdecd..72e06ca 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LiteralTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LiteralTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LoopTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LoopTreeTest.java
index e4ff780..8222942 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LoopTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/LoopTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/MatchTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/MatchTreeTest.java
index 4493903..415c81e 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/MatchTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/MatchTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ReturnTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ReturnTreeTest.java
index 3b5b655..42ee197 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ReturnTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ReturnTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/Scala3TreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/Scala3TreeTest.java
index 7ab224b..4919ae1 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/Scala3TreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/Scala3TreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaCodeVerifierTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaCodeVerifierTest.java
index 025ee75..4bdad3b 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaCodeVerifierTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaCodeVerifierTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaConverterTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaConverterTest.java
index 88c2293..8b76659 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaConverterTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ScalaConverterTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ThrowTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ThrowTreeTest.java
index 91ea24e..1395809 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ThrowTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/ThrowTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/UnaryExpressionTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/UnaryExpressionTreeTest.java
index 998d397..0360ff4 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/UnaryExpressionTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/UnaryExpressionTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/VariableDeclarationTreeTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/VariableDeclarationTreeTest.java
index bfca963..f0a4baf 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/VariableDeclarationTreeTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/converter/VariableDeclarationTreeTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinitionTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinitionTest.java
index 0f4cd0f..1095e9d 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinitionTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleRulesDefinitionTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensorTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensorTest.java
index d20b9b3..8de06e7 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensorTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scalastyle/ScalastyleSensorTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinitionTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinitionTest.java
index 1ee81a5..c266fa8 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinitionTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatRulesDefinitionTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensorTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensorTest.java
index 89656e7..54faee5 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensorTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/externalreport/scapegoat/ScapegoatSensorTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaCheckListTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaCheckListTest.java
index 07d84a3..9ed831f 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaCheckListTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaCheckListTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaLanguageTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaLanguageTest.java
index 0a3cece..35fe594 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaLanguageTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaLanguageTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaPluginTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaPluginTest.java
index 69d5e41..1c3ebcd 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaPluginTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaPluginTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaProfileDefinitionTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaProfileDefinitionTest.java
index c5e2fa5..93f7bb3 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaProfileDefinitionTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaProfileDefinitionTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaRulesDefinitionTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaRulesDefinitionTest.java
index faa54a2..f1b1818 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaRulesDefinitionTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaRulesDefinitionTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaSensorTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaSensorTest.java
index 21f2f33..6860303 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaSensorTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScalaSensorTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
diff --git a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScoverageSensorTest.java b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScoverageSensorTest.java
index 0fafbce..0c01573 100644
--- a/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScoverageSensorTest.java
+++ b/sonar-scala-plugin/src/test/java/org/sonarsource/scala/plugin/ScoverageSensorTest.java
@@ -1,6 +1,6 @@
 /*
  * SonarSource Scala
- * Copyright (C) 2018-2024 SonarSource SA
+ * Copyright (C) 2018-2025 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or

From 5f92152dabf2c84e984b77757eb3bf693ed5e677 Mon Sep 17 00:00:00 2001
From: erwan-serandour <erwan.serandour@sonarsource.com>
Date: Thu, 9 Jan 2025 09:25:08 +0100
Subject: [PATCH 3/6] SONARSCALA-40 remove queries to non-persisted metrics
 (#40)

---
 its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java b/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java
index daa21a7..a5bc2e3 100644
--- a/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java
+++ b/its/plugin/src/test/java/org/sonarsource/slang/MeasuresTest.java
@@ -34,7 +34,6 @@ public void scala_measures() {
     final String componentKey = projectKey + ":file.scala";
     assertThat(getMeasureAsInt(componentKey, "ncloc")).isEqualTo(8);
     assertThat(getMeasureAsInt(componentKey, "comment_lines")).isEqualTo(2);
-    assertThat(getMeasure(componentKey, "ncloc_data").getValue()).isEqualTo("1=1;3=1;7=1;10=1;11=1;12=1;13=1;15=1");
     assertThat(getMeasureAsInt(componentKey, "functions")).isEqualTo(1);
 
     List<Issues.Issue> issuesForRule = getIssuesForRule(projectKey, "scala:S1135");

From e6a6106f52726c1d20ecc7383c52f217540eebae Mon Sep 17 00:00:00 2001
From: edward-gonzales-sonarsource
 <134292381+edward-gonzales-sonarsource@users.noreply.github.com>
Date: Mon, 3 Feb 2025 09:55:42 +0100
Subject: [PATCH 4/6] SONARSCALA-43 Update CODEOWNERS after reorg (#41)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 02ff9c1..3389322 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-.github/CODEOWNERS @sonarsource/analysis-jvm-squad
+.github/CODEOWNERS @SonarSource/quality-jvm-squad

From 22eda1562e852efa8b47e601946088a383c1a54d Mon Sep 17 00:00:00 2001
From: Dorian Burihabwa <dorian.burihabwa@sonarsource.com>
Date: Thu, 27 Feb 2025 13:20:34 +0100
Subject: [PATCH 5/6] SONARSCALA-47 Prepare next development iteration

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3fc3f3d..5eae18d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.sonarsource.slang
-version=1.18.0-SNAPSHOT
+version=1.18.1-SNAPSHOT
 description=Code Analyzer for Scala
 projectTitle=Scala
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xms256m -Xmx1024m

From 1e48054143dc2577791e29356e052ee18a2edb3f Mon Sep 17 00:00:00 2001
From: Dorian Burihabwa <dorian.burihabwa@sonarsource.com>
Date: Thu, 27 Feb 2025 13:28:03 +0100
Subject: [PATCH 6/6] SONARSCALA-49 Restrict ITs to run only against 2025.1

---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 9d191d7..28062d3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -90,8 +90,8 @@ qa_plugin_task:
     memory: 8G
   env:
     matrix:
-      - SQ_VERSION: "LATEST_RELEASE"
-      - SQ_VERSION: "DEV"
+      - SQ_VERSION: "LATEST_RELEASE[25.1]"
+      - SQ_VERSION: "DEV[25.1"
   <<: *SETUP_GRADLE_CACHE
   plugin_script:
     - source cirrus-env QA
@@ -113,7 +113,7 @@ qa_ruling_task:
     - source cirrus-env QA
     - git submodule update --init its/sources
     - ./gradlew ":its:ruling:test" --project-prop ruling      
-      "-Dsonar.runtimeVersion=LATEST_RELEASE"
+      "-Dsonar.runtimeVersion=LATEST_RELEASE[25.1]"
       "-Dorchestrator.artifactory.accessToken=${ARTIFACTORY_ACCESS_TOKEN}"
       "-DbuildNumber=$BUILD_NUMBER"
       -I "${GRADLE_HOME}/init.d/repoxAuth.init.gradle.kts"