SONARJAVA-6235 Update orchestrator to 6.1.0.3962

its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaClasspathTest.java

@@ -20,6 +20,7 @@
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.locator.Locators;
 import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
 import java.nio.file.Path;
@@ -67,7 +68,7 @@ public void copyGuavaJar() {
     File subFolder = new File(tmp.getRoot(), "subFolder");
     // Use a folder with comma to test proper property parsing
     File subSubFolder = new File(subFolder, "sub,SubFolder");
-    ORCHESTRATOR.getConfiguration().locators().copyToDirectory(guava, subSubFolder);
+    new Locators(ORCHESTRATOR.getConfiguration()).copyToDirectory(guava, subSubFolder);
 
     aarPath = new File(new File(TestUtils.projectDir("using-aar-dep"), "lib"), "cache-1.3.0.aar").getAbsolutePath();
     guavaJarPathEscaped = "\"" + new File(subSubFolder.getAbsolutePath(), guava.getFilename()).getAbsolutePath() + "\"";

its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTest.java

@@ -20,6 +20,7 @@
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.locator.Locators;
 import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
 import java.util.List;
@@ -154,7 +155,7 @@ public void support_change_of_extension_property() {
   @Test
   public void should_execute_rule_on_test() {
     MavenLocation junit411 = MavenLocation.of("junit", "junit", "4.11");
-    orchestrator.getConfiguration().locators().copyToDirectory(junit411, tmp.getRoot());
+    new Locators(orchestrator.getConfiguration()).copyToDirectory(junit411, tmp.getRoot());
     MavenBuild build = TestUtils.createMavenBuild()
       .setPom(TestUtils.projectPom("java-inner-classes"))
       .setProperty("sonar.java.test.binaries", "target/test-classes")

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

@@ -193,9 +193,10 @@ public void guava() throws Exception {
     String projectName = "guava";
     MavenBuild build = test_project("com.google.guava:guava", projectName);
     build
-      // by default guava is compatible with java 6, however this is not supported with JDK 21
-      .setProperty("java.version", "1.8")
+      .setProperty("java.version", "17")
+      .setProperty("maven-bundle-plugin.version", "5.1.4")
       .setProperty("maven.javadoc.skip", "true")
+      .setProperty("animal.sniffer.skip", "true")
       // use batch
       .setProperty("sonar.java.experimental.batchModeSizeInKB", "8192");
     executeBuildWithCommonProperties(build, projectName);

its/ruling/src/test/resources/guava/java-S1610.json

@@ -26,6 +26,9 @@
 "com.google.guava:guava:src/com/google/common/io/CharSink.java": [
 49
 ],
+"com.google.guava:guava:src/com/google/common/io/CharSource.java": [
+66
+],
 "com.google.guava:guava:src/com/google/common/reflect/TypeCapture.java": [
 29
 ],

its/ruling/src/test/resources/guava/java-S4738.json

@@ -107,6 +107,9 @@
 32,
 35
 ],
+"com.google.guava:guava:src/com/google/common/collect/AbstractListMultimap.java": [
+54
+],
 "com.google.guava:guava:src/com/google/common/collect/BinaryTreeTraverser.java": [
 71,
 78,
@@ -116,6 +119,9 @@
 35,
 38
 ],
+"com.google.guava:guava:src/com/google/common/collect/CartesianList.java": [
+45
+],
 "com.google.guava:guava:src/com/google/common/collect/Collections2.java": [
 91,
 135,
@@ -125,6 +131,9 @@
 249,
 251
 ],
+"com.google.guava:guava:src/com/google/common/collect/CompoundOrdering.java": [
+30
+],
 "com.google.guava:guava:src/com/google/common/collect/ComputingConcurrentHashMap.java": [
 43,
 49,
@@ -134,6 +143,9 @@
 401,
 414
 ],
+"com.google.guava:guava:src/com/google/common/collect/EmptyContiguousSet.java": [
+117
+],
 "com.google.guava:guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
 49,
 51,
@@ -149,7 +161,8 @@
 ],
 "com.google.guava:guava:src/com/google/common/collect/FilteredKeyMultimap.java": [
 42,
-44
+44,
+87
 ],
 "com.google.guava:guava:src/com/google/common/collect/FilteredKeySetMultimap.java": [
 36
@@ -178,11 +191,57 @@
 "com.google.guava:guava:src/com/google/common/collect/GenericMapMaker.java": [
 149
 ],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableCollection.java": [
+288,
+290
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableList.java": [
+252,
+256,
+274,
+305,
+374,
+376
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableListMultimap.java": [
+299
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableRangeMap.java": [
+46,
+46,
+60,
+60
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableRangeSet.java": [
+48,
+51,
+80,
+274,
+306,
+626
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMap.java": [
+68,
+75,
+101,
+102
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedSet.java": [
+65,
+71,
+86
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableTable.java": [
+47
+],
 "com.google.guava:guava:src/com/google/common/collect/Iterables.java": [
 171,
 179,
 206,
 232,
+434,
+448,
+466,
 582,
 620,
 628,
@@ -318,7 +377,8 @@
 288
 ],
 "com.google.guava:guava:src/com/google/common/collect/Ordering.java": [
-409
+409,
+694
 ],
 "com.google.guava:guava:src/com/google/common/collect/Platform.java": [
 80,
@@ -329,6 +389,15 @@
 117,
 129
 ],
+"com.google.guava:guava:src/com/google/common/collect/RegularImmutableMultiset.java": [
+39
+],
+"com.google.guava:guava:src/com/google/common/collect/RegularImmutableSet.java": [
+85
+],
+"com.google.guava:guava:src/com/google/common/collect/RegularImmutableTable.java": [
+80
+],
 "com.google.guava:guava:src/com/google/common/collect/Sets.java": [
 647,
 684,
@@ -343,6 +412,9 @@
 949,
 962
 ],
+"com.google.guava:guava:src/com/google/common/collect/SingletonImmutableList.java": [
+56
+],
 "com.google.guava:guava:src/com/google/common/collect/SortedLists.java": [
 202,
 222
@@ -410,6 +482,9 @@
 "com.google.guava:guava:src/com/google/common/reflect/ClassPath.java": [
 64
 ],
+"com.google.guava:guava:src/com/google/common/reflect/TypeToken.java": [
+1153
+],
 "com.google.guava:guava:src/com/google/common/reflect/Types.java": [
 60
 ],
@@ -421,6 +496,7 @@
 91
 ],
 "com.google.guava:guava:src/com/google/common/util/concurrent/CollectionFuture.java": [
+45,
 59
 ],
 "com.google.guava:guava:src/com/google/common/util/concurrent/Futures.java": [
@@ -443,7 +519,11 @@
 877,
 908
 ],
+"com.google.guava:guava:src/com/google/common/util/concurrent/ServiceManager.java": [
+197
+],
 "com.google.guava:guava:src/com/google/common/util/concurrent/Striped.java": [
+148,
 221,
 282,
 316,

its/ruling/src/test/resources/guava/java-S5194.json

@@ -0,0 +1,48 @@
+{
+"com.google.guava:guava:src/com/google/common/base/CharMatcher.java": [
+335,
+1263
+],
+"com.google.guava:guava:src/com/google/common/base/Joiner.java": [
+462
+],
+"com.google.guava:guava:src/com/google/common/base/Stopwatch.java": [
+242
+],
+"com.google.guava:guava:src/com/google/common/cache/CacheBuilderSpec.java": [
+420
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableCollection.java": [
+286
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableEnumSet.java": [
+36
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableList.java": [
+272,
+372
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSet.java": [
+298
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMap.java": [
+494
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableTable.java": [
+227
+],
+"com.google.guava:guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
+315
+],
+"com.google.guava:guava:src/com/google/common/collect/Range.java": [
+249,
+287
+],
+"com.google.guava:guava:src/com/google/common/collect/TreeMultiset.java": [
+181,
+203
+],
+"com.google.guava:guava:src/com/google/common/net/MediaType.java": [
+423
+]
+}

its/ruling/src/test/resources/guava/java-S6126.json

@@ -0,0 +1,5 @@
+{
+"com.google.guava:guava:src/com/google/common/reflect/TypeToken.java": [
+114
+]
+}