diff --git a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaClasspathTest.java b/its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaClasspathTest.java
index a591d9db8d3..8ce3fdf24b3 100644
--- a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaClasspathTest.java
+++ b/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() + "\"";
diff --git a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTest.java b/its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTest.java
index 317ee8164cf..0a848b174e1 100644
--- a/its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTest.java
+++ b/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")
diff --git a/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java b/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java
index 32982f704c0..8a471d6a3c3 100644
--- a/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java
+++ b/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);
diff --git a/its/ruling/src/test/resources/guava/java-S1610.json b/its/ruling/src/test/resources/guava/java-S1610.json
index 08bb97c9146..383f880b6ea 100644
--- a/its/ruling/src/test/resources/guava/java-S1610.json
+++ b/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
 ],
diff --git a/its/ruling/src/test/resources/guava/java-S4738.json b/its/ruling/src/test/resources/guava/java-S4738.json
index 348f09bc590..d60adb30add 100644
--- a/its/ruling/src/test/resources/guava/java-S4738.json
+++ b/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,
diff --git a/its/ruling/src/test/resources/guava/java-S5194.json b/its/ruling/src/test/resources/guava/java-S5194.json
new file mode 100644
index 00000000000..27c9d80639d
--- /dev/null
+++ b/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
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S6126.json b/its/ruling/src/test/resources/guava/java-S6126.json
new file mode 100644
index 00000000000..9e74c1d4858
--- /dev/null
+++ b/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
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S6201.json b/its/ruling/src/test/resources/guava/java-S6201.json
new file mode 100644
index 00000000000..9dab2e15261
--- /dev/null
+++ b/its/ruling/src/test/resources/guava/java-S6201.json
@@ -0,0 +1,241 @@
+{
+"com.google.guava:guava:src/com/google/common/base/Ascii.java": [
+463,
+512
+],
+"com.google.guava:guava:src/com/google/common/base/CaseFormat.java": [
+198
+],
+"com.google.guava:guava:src/com/google/common/base/CharMatcher.java": [
+373
+],
+"com.google.guava:guava:src/com/google/common/base/Joiner.java": [
+448
+],
+"com.google.guava:guava:src/com/google/common/base/Predicates.java": [
+502,
+538,
+656
+],
+"com.google.guava:guava:src/com/google/common/cache/CacheStats.java": [
+251
+],
+"com.google.guava:guava:src/com/google/common/cache/LocalCache.java": [
+2200
+],
+"com.google.guava:guava:src/com/google/common/collect/Count.java": [
+67
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableClassToInstanceMap.java": [
+150
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSet.java": [
+243
+],
+"com.google.guava:guava:src/com/google/common/collect/Lists.java": [
+718,
+723
+],
+"com.google.guava:guava:src/com/google/common/escape/Escapers.java": [
+184,
+186
+],
+"com.google.guava:guava:src/com/google/common/eventbus/Subscriber.java": [
+101,
+122
+],
+"com.google.guava:guava:src/com/google/common/eventbus/SubscriberRegistry.java": [
+252
+],
+"com.google.guava:guava:src/com/google/common/hash/BloomFilterStrategies.java": [
+205
+],
+"com.google.guava:guava:src/com/google/common/hash/Funnels.java": [
+110
+],
+"com.google.guava:guava:src/com/google/common/hash/HashCode.java": [
+390
+],
+"com.google.guava:guava:src/com/google/common/hash/Hashing.java": [
+544
+],
+"com.google.guava:guava:src/com/google/common/hash/Murmur3_128HashFunction.java": [
+68
+],
+"com.google.guava:guava:src/com/google/common/hash/Murmur3_32HashFunction.java": [
+74
+],
+"com.google.guava:guava:src/com/google/common/hash/SipHashFunction.java": [
+82
+],
+"com.google.guava:guava:src/com/google/common/io/AppendableWriter.java": [
+64,
+71
+],
+"com.google.guava:guava:src/com/google/common/io/ByteSink.java": [
+86
+],
+"com.google.guava:guava:src/com/google/common/io/ByteSource.java": [
+100
+],
+"com.google.guava:guava:src/com/google/common/io/ByteStreams.java": [
+122
+],
+"com.google.guava:guava:src/com/google/common/io/CharSink.java": [
+80
+],
+"com.google.guava:guava:src/com/google/common/io/CharSource.java": [
+93
+],
+"com.google.guava:guava:src/com/google/common/io/CharStreams.java": [
+252,
+262,
+278
+],
+"com.google.guava:guava:src/com/google/common/io/LineReader.java": [
+57
+],
+"com.google.guava:guava:src/com/google/common/net/HostAndPort.java": [
+280
+],
+"com.google.guava:guava:src/com/google/common/net/HostSpecifier.java": [
+154
+],
+"com.google.guava:guava:src/com/google/common/net/InetAddresses.java": [
+870
+],
+"com.google.guava:guava:src/com/google/common/net/InternetDomainName.java": [
+535
+],
+"com.google.guava:guava:src/com/google/common/net/MediaType.java": [
+702
+],
+"com.google.guava:guava:src/com/google/common/primitives/Booleans.java": [
+319,
+390,
+397,
+409,
+442
+],
+"com.google.guava:guava:src/com/google/common/primitives/Bytes.java": [
+233,
+304,
+310,
+322,
+355
+],
+"com.google.guava:guava:src/com/google/common/primitives/Chars.java": [
+433,
+504,
+511,
+523,
+556
+],
+"com.google.guava:guava:src/com/google/common/primitives/Doubles.java": [
+421,
+495,
+502,
+514,
+547
+],
+"com.google.guava:guava:src/com/google/common/primitives/Floats.java": [
+417,
+491,
+497,
+509,
+542
+],
+"com.google.guava:guava:src/com/google/common/primitives/Ints.java": [
+482,
+553,
+559,
+571,
+604
+],
+"com.google.guava:guava:src/com/google/common/primitives/Longs.java": [
+518,
+589,
+595,
+607,
+640
+],
+"com.google.guava:guava:src/com/google/common/primitives/Shorts.java": [
+481,
+552,
+558,
+570,
+603
+],
+"com.google.guava:guava:src/com/google/common/primitives/UnsignedInteger.java": [
+238
+],
+"com.google.guava:guava:src/com/google/common/primitives/UnsignedLong.java": [
+249
+],
+"com.google.guava:guava:src/com/google/common/reflect/ClassPath.java": [
+197,
+390
+],
+"com.google.guava:guava:src/com/google/common/reflect/Element.java": [
+154
+],
+"com.google.guava:guava:src/com/google/common/reflect/Parameter.java": [
+126
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeResolver.java": [
+161,
+163,
+165,
+393,
+397,
+404,
+463
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeToken.java": [
+280,
+319,
+370,
+390,
+474,
+482,
+492,
+498,
+500,
+865,
+881,
+900,
+900
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeVisitor.java": [
+79,
+81,
+85
+],
+"com.google.guava:guava:src/com/google/common/reflect/Types.java": [
+71,
+253,
+435,
+477
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
+470,
+472,
+569,
+692
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Futures.java": [
+2046
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
+201
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/MoreExecutors.java": [
+481,
+483,
+510
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/SimpleTimeLimiter.java": [
+158,
+161
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S6206.json b/its/ruling/src/test/resources/guava/java-S6206.json
new file mode 100644
index 00000000000..7fa714e8da8
--- /dev/null
+++ b/its/ruling/src/test/resources/guava/java-S6206.json
@@ -0,0 +1,8 @@
+{
+"com.google.guava:guava:src/com/google/common/cache/CacheStats.java": [
+61
+],
+"com.google.guava:guava:src/com/google/common/net/InetAddresses.java": [
+625
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S6208.json b/its/ruling/src/test/resources/guava/java-S6208.json
new file mode 100644
index 00000000000..fba03f18260
--- /dev/null
+++ b/its/ruling/src/test/resources/guava/java-S6208.json
@@ -0,0 +1,49 @@
+{
+"com.google.guava:guava:src/com/google/common/base/CharMatcher.java": [
+1275
+],
+"com.google.guava:guava:src/com/google/common/math/BigIntegerMath.java": [
+76,
+80,
+85,
+176,
+180,
+185,
+217,
+220,
+228
+],
+"com.google.guava:guava:src/com/google/common/math/DoubleMath.java": [
+260
+],
+"com.google.guava:guava:src/com/google/common/math/IntMath.java": [
+94,
+98,
+103,
+137,
+140,
+144,
+238,
+241,
+245,
+317
+],
+"com.google.guava:guava:src/com/google/common/math/LongMath.java": [
+93,
+97,
+102,
+137,
+140,
+144,
+306,
+312,
+319,
+384
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AbstractService.java": [
+207,
+363,
+367,
+470
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S6212.json b/its/ruling/src/test/resources/guava/java-S6212.json
new file mode 100644
index 00000000000..854b4740443
--- /dev/null
+++ b/its/ruling/src/test/resources/guava/java-S6212.json
@@ -0,0 +1,1489 @@
+{
+"com.google.guava:guava:src/com/google/common/base/AbstractIterator.java": [
+81
+],
+"com.google.guava:guava:src/com/google/common/base/Ascii.java": [
+440,
+467,
+468,
+489,
+516,
+517,
+599,
+643,
+644,
+645
+],
+"com.google.guava:guava:src/com/google/common/base/CaseFormat.java": [
+147
+],
+"com.google.guava:guava:src/com/google/common/base/CharMatcher.java": [
+439,
+448,
+449,
+619,
+620,
+638,
+645,
+698,
+739,
+746,
+748,
+805,
+854,
+855,
+880,
+905,
+943,
+945,
+1074,
+1081,
+1082,
+1250,
+1317,
+1356,
+1357,
+1532,
+1568,
+1570,
+1759
+],
+"com.google.guava:guava:src/com/google/common/base/Defaults.java": [
+67
+],
+"com.google.guava:guava:src/com/google/common/base/FinalizableReferenceQueue.java": [
+163,
+313,
+319
+],
+"com.google.guava:guava:src/com/google/common/base/MoreObjects.java": [
+329,
+331,
+344,
+355,
+361,
+367
+],
+"com.google.guava:guava:src/com/google/common/base/Objects.java": [
+394,
+396,
+413,
+419,
+425
+],
+"com.google.guava:guava:src/com/google/common/base/PairwiseEquivalence.java": [
+51
+],
+"com.google.guava:guava:src/com/google/common/base/Preconditions.java": [
+413,
+414,
+415
+],
+"com.google.guava:guava:src/com/google/common/base/Predicates.java": [
+373,
+415,
+669
+],
+"com.google.guava:guava:src/com/google/common/base/SmallCharMatcher.java": [
+96
+],
+"com.google.guava:guava:src/com/google/common/base/Splitter.java": [
+189,
+233
+],
+"com.google.guava:guava:src/com/google/common/base/Strings.java": [
+105,
+137,
+166,
+172,
+195,
+218
+],
+"com.google.guava:guava:src/com/google/common/base/Suppliers.java": [
+131,
+199
+],
+"com.google.guava:guava:src/com/google/common/base/Throwables.java": [
+215,
+335
+],
+"com.google.guava:guava:src/com/google/common/base/Utf8.java": [
+57,
+66,
+85,
+87
+],
+"com.google.guava:guava:src/com/google/common/base/internal/Finalizer.java": [
+82,
+83,
+144,
+202
+],
+"com.google.guava:guava:src/com/google/common/cache/AbstractCache.java": [
+71,
+72
+],
+"com.google.guava:guava:src/com/google/common/cache/CacheBuilder.java": [
+831
+],
+"com.google.guava:guava:src/com/google/common/cache/CacheBuilderSpec.java": [
+137,
+147,
+418,
+439
+],
+"com.google.guava:guava:src/com/google/common/cache/LocalCache.java": [
+271,
+272,
+288,
+297,
+305,
+1890,
+2145,
+2183,
+2216,
+2230,
+2237,
+2302,
+2331,
+2367,
+2419,
+2486,
+2500,
+2650,
+2716,
+2751,
+2774,
+2815,
+2817,
+2853,
+2859,
+2931,
+2989,
+2993,
+3042,
+3046,
+3089,
+3093,
+3140,
+3144,
+3194,
+3198,
+3232,
+3240,
+3342,
+3376,
+3536,
+3538,
+3699,
+3836,
+3888,
+3890,
+3898,
+3914,
+3938,
+3957,
+3958,
+3962,
+3968,
+3979,
+3980,
+3985,
+4002,
+4032,
+4034,
+4065,
+4067,
+4068,
+4130,
+4131,
+4138,
+4140,
+4337,
+4338,
+4545,
+4802
+],
+"com.google.guava:guava:src/com/google/common/cache/LongAdder.java": [
+72,
+109,
+145
+],
+"com.google.guava:guava:src/com/google/common/cache/RemovalNotification.java": [
+100,
+101
+],
+"com.google.guava:guava:src/com/google/common/cache/Striped64.java": [
+197,
+202,
+208,
+210,
+240,
+241,
+257,
+260,
+284
+],
+"com.google.guava:guava:src/com/google/common/collect/AbstractBiMap.java": [
+135,
+153,
+342,
+353
+],
+"com.google.guava:guava:src/com/google/common/collect/AbstractIterator.java": [
+157
+],
+"com.google.guava:guava:src/com/google/common/collect/AbstractMapBasedMultimap.java": [
+827,
+973,
+1138,
+1288,
+1341
+],
+"com.google.guava:guava:src/com/google/common/collect/AbstractMapBasedMultiset.java": [
+107
+],
+"com.google.guava:guava:src/com/google/common/collect/AbstractMapEntry.java": [
+58,
+59
+],
+"com.google.guava:guava:src/com/google/common/collect/AbstractMultimap.java": [
+89
+],
+"com.google.guava:guava:src/com/google/common/collect/ArrayTable.java": [
+182,
+340,
+361,
+626,
+716
+],
+"com.google.guava:guava:src/com/google/common/collect/BinaryTreeTraverser.java": [
+114,
+152,
+192
+],
+"com.google.guava:guava:src/com/google/common/collect/CartesianList.java": [
+54
+],
+"com.google.guava:guava:src/com/google/common/collect/Collections2.java": [
+170,
+437,
+438,
+532,
+632
+],
+"com.google.guava:guava:src/com/google/common/collect/CompoundOrdering.java": [
+41
+],
+"com.google.guava:guava:src/com/google/common/collect/ComputingConcurrentHashMap.java": [
+83,
+93,
+105,
+113,
+159,
+190,
+327,
+437
+],
+"com.google.guava:guava:src/com/google/common/collect/ConcurrentHashMultiset.java": [
+169,
+198,
+239,
+252,
+382,
+439
+],
+"com.google.guava:guava:src/com/google/common/collect/DenseImmutableTable.java": [
+56,
+57,
+58,
+60,
+61,
+64,
+127,
+258,
+259,
+260
+],
+"com.google.guava:guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
+151,
+154,
+187,
+199,
+203,
+263,
+309,
+361,
+362,
+365
+],
+"com.google.guava:guava:src/com/google/common/collect/FilteredKeyMultimap.java": [
+61,
+72
+],
+"com.google.guava:guava:src/com/google/common/collect/FluentIterable.java": [
+329
+],
+"com.google.guava:guava:src/com/google/common/collect/ForwardingCollection.java": [
+241
+],
+"com.google.guava:guava:src/com/google/common/collect/ForwardingMap.java": [
+168
+],
+"com.google.guava:guava:src/com/google/common/collect/ForwardingMapEntry.java": [
+114,
+115
+],
+"com.google.guava:guava:src/com/google/common/collect/GeneralRange.java": [
+160,
+169,
+186,
+187,
+201,
+202
+],
+"com.google.guava:guava:src/com/google/common/collect/HashBiMap.java": [
+496,
+653
+],
+"com.google.guava:guava:src/com/google/common/collect/Hashing.java": [
+60
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableCollection.java": [
+171
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableList.java": [
+182,
+485,
+572,
+574
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableListMultimap.java": [
+254,
+367,
+372,
+374,
+375,
+376,
+382
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableMap.java": [
+551,
+632,
+646
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableMapEntrySet.java": [
+74
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableMultiset.java": [
+385,
+395
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableRangeSet.java": [
+491,
+502
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSet.java": [
+107,
+108,
+140,
+146,
+148,
+149,
+150,
+171
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
+322,
+525,
+530,
+532,
+533,
+534,
+540
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMap.java": [
+275,
+325,
+326,
+329,
+339,
+342,
+343,
+344
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMultiset.java": [
+263,
+264,
+527,
+538
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedSet.java": [
+149,
+377,
+378,
+380
+],
+"com.google.guava:guava:src/com/google/common/collect/Interners.java": [
+49,
+81
+],
+"com.google.guava:guava:src/com/google/common/collect/Iterables.java": [
+182,
+183,
+186,
+236,
+876
+],
+"com.google.guava:guava:src/com/google/common/collect/Iterators.java": [
+199,
+240,
+307,
+312,
+314,
+363,
+641,
+642,
+669,
+712,
+789,
+790,
+891,
+991,
+1010,
+1174,
+1320
+],
+"com.google.guava:guava:src/com/google/common/collect/LinkedHashMultimap.java": [
+329,
+382,
+443,
+561,
+563,
+565,
+568,
+569,
+571,
+573
+],
+"com.google.guava:guava:src/com/google/common/collect/LinkedListMultimap.java": [
+137,
+727,
+812,
+813,
+815,
+817
+],
+"com.google.guava:guava:src/com/google/common/collect/Lists.java": [
+937,
+964,
+980,
+1009,
+1015
+],
+"com.google.guava:guava:src/com/google/common/collect/MapConstraints.java": [
+505
+],
+"com.google.guava:guava:src/com/google/common/collect/MapMaker.java": [
+593,
+841,
+842
+],
+"com.google.guava:guava:src/com/google/common/collect/MapMakerInternalMap.java": [
+226,
+227,
+243,
+252,
+260,
+1901,
+2146,
+2199,
+2213,
+2409,
+2442,
+2480,
+2482,
+2516,
+2522,
+2592,
+2649,
+2655,
+2700,
+2706,
+2745,
+2749,
+2788,
+2792,
+2826,
+2835,
+2933,
+2970,
+3032,
+3198,
+3334,
+3397,
+3399,
+3407,
+3424,
+3473,
+3474,
+3481,
+3483,
+3668,
+3669,
+3761,
+3856,
+3950,
+3951,
+3973,
+3977,
+4006
+],
+"com.google.guava:guava:src/com/google/common/collect/Maps.java": [
+442,
+527,
+799,
+810,
+940,
+1135,
+1207,
+2635,
+2656,
+2911,
+4078
+],
+"com.google.guava:guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
+271,
+403,
+406,
+425,
+463,
+488,
+571,
+631,
+641,
+673,
+830,
+886,
+893,
+935
+],
+"com.google.guava:guava:src/com/google/common/collect/Multimaps.java": [
+1510,
+1623
+],
+"com.google.guava:guava:src/com/google/common/collect/Multisets.java": [
+328,
+488,
+626,
+696,
+743,
+779,
+818,
+830
+],
+"com.google.guava:guava:src/com/google/common/collect/ObjectArrays.java": [
+203,
+209,
+230
+],
+"com.google.guava:guava:src/com/google/common/collect/Ordering.java": [
+504,
+580,
+723,
+725,
+730,
+736,
+745,
+748,
+783
+],
+"com.google.guava:guava:src/com/google/common/collect/Queues.java": [
+269,
+275,
+304,
+305
+],
+"com.google.guava:guava:src/com/google/common/collect/Range.java": [
+651
+],
+"com.google.guava:guava:src/com/google/common/collect/RegularImmutableBiMap.java": [
+68,
+70,
+73,
+74
+],
+"com.google.guava:guava:src/com/google/common/collect/RegularImmutableMap.java": [
+65,
+67,
+68
+],
+"com.google.guava:guava:src/com/google/common/collect/RegularImmutableMultiset.java": [
+51,
+62,
+64,
+65
+],
+"com.google.guava:guava:src/com/google/common/collect/Serialization.java": [
+73,
+84,
+86,
+88,
+118,
+130,
+132,
+133,
+167,
+179,
+181,
+183,
+184,
+186,
+196
+],
+"com.google.guava:guava:src/com/google/common/collect/Sets.java": [
+902,
+1219,
+1224,
+1291,
+1372,
+1571
+],
+"com.google.guava:guava:src/com/google/common/collect/SingletonImmutableList.java": [
+60
+],
+"com.google.guava:guava:src/com/google/common/collect/SingletonImmutableSet.java": [
+89
+],
+"com.google.guava:guava:src/com/google/common/collect/SortedLists.java": [
+93,
+266
+],
+"com.google.guava:guava:src/com/google/common/collect/SparseImmutableTable.java": [
+48,
+49,
+50,
+52,
+53,
+54,
+59
+],
+"com.google.guava:guava:src/com/google/common/collect/StandardTable.java": [
+117,
+155,
+168,
+415,
+421,
+445,
+592,
+608,
+626,
+758,
+813,
+842,
+871,
+883
+],
+"com.google.guava:guava:src/com/google/common/collect/TreeMultiset.java": [
+231,
+259,
+272,
+276,
+305,
+328,
+363,
+385
+],
+"com.google.guava:guava:src/com/google/common/collect/TreeRangeMap.java": [
+517
+],
+"com.google.guava:guava:src/com/google/common/collect/TreeTraverser.java": [
+157,
+210
+],
+"com.google.guava:guava:src/com/google/common/escape/ArrayBasedCharEscaper.java": [
+119,
+120
+],
+"com.google.guava:guava:src/com/google/common/escape/ArrayBasedEscaperMap.java": [
+82
+],
+"com.google.guava:guava:src/com/google/common/escape/ArrayBasedUnicodeEscaper.java": [
+154,
+155,
+168
+],
+"com.google.guava:guava:src/com/google/common/escape/CharEscaper.java": [
+62,
+87,
+88,
+163
+],
+"com.google.guava:guava:src/com/google/common/escape/CharEscaperBuilder.java": [
+58,
+59,
+115
+],
+"com.google.guava:guava:src/com/google/common/escape/Escapers.java": [
+239,
+255,
+258,
+265
+],
+"com.google.guava:guava:src/com/google/common/escape/UnicodeEscaper.java": [
+118,
+180,
+181,
+184,
+268,
+279,
+303
+],
+"com.google.guava:guava:src/com/google/common/eventbus/EventBus.java": [
+237,
+248
+],
+"com.google.guava:guava:src/com/google/common/eventbus/SubscriberRegistry.java": [
+197
+],
+"com.google.guava:guava:src/com/google/common/hash/AbstractCompositeHashFunction.java": [
+50,
+51
+],
+"com.google.guava:guava:src/com/google/common/hash/AbstractNonStreamingHashFunction.java": [
+52,
+53,
+130
+],
+"com.google.guava:guava:src/com/google/common/hash/AbstractStreamingHashFunction.java": [
+170,
+187
+],
+"com.google.guava:guava:src/com/google/common/hash/BloomFilter.java": [
+495,
+524,
+533,
+534,
+539
+],
+"com.google.guava:guava:src/com/google/common/hash/BloomFilterStrategies.java": [
+49,
+53,
+54,
+69,
+73,
+101,
+103,
+120,
+197,
+206
+],
+"com.google.guava:guava:src/com/google/common/hash/HashCode.java": [
+168,
+235,
+309,
+333,
+334,
+362,
+363,
+412,
+432
+],
+"com.google.guava:guava:src/com/google/common/hash/Hashing.java": [
+77,
+80,
+392,
+393,
+421,
+426,
+446,
+451,
+514,
+528,
+529
+],
+"com.google.guava:guava:src/com/google/common/hash/Murmur3_128HashFunction.java": [
+97,
+98
+],
+"com.google.guava:guava:src/com/google/common/hash/Murmur3_32HashFunction.java": [
+114,
+176,
+177
+],
+"com.google.guava:guava:src/com/google/common/hash/SipHashFunction.java": [
+140,
+164
+],
+"com.google.guava:guava:src/com/google/common/io/BaseEncoding.java": [
+158,
+195,
+225,
+447,
+449,
+457,
+458,
+503,
+504,
+516,
+517,
+614,
+625,
+631,
+657,
+658,
+660,
+661,
+756,
+767,
+780,
+803,
+813,
+826,
+827,
+874,
+875,
+957
+],
+"com.google.guava:guava:src/com/google/common/io/ByteSink.java": [
+99,
+121
+],
+"com.google.guava:guava:src/com/google/common/io/ByteSource.java": [
+133,
+188,
+255,
+275,
+293,
+317,
+334,
+349,
+350,
+352,
+497,
+665,
+730,
+743
+],
+"com.google.guava:guava:src/com/google/common/io/ByteStreams.java": [
+96,
+135,
+156,
+169,
+190,
+194,
+738,
+777
+],
+"com.google.guava:guava:src/com/google/common/io/CharSequenceReader.java": [
+69,
+89
+],
+"com.google.guava:guava:src/com/google/common/io/CharSink.java": [
+79,
+93,
+127,
+151
+],
+"com.google.guava:guava:src/com/google/common/io/CharSource.java": [
+92,
+143,
+173,
+193,
+211,
+232,
+254,
+288,
+316,
+538,
+592,
+605
+],
+"com.google.guava:guava:src/com/google/common/io/CharStreams.java": [
+66,
+98,
+118,
+141
+],
+"com.google.guava:guava:src/com/google/common/io/Closer.java": [
+208,
+212
+],
+"com.google.guava:guava:src/com/google/common/io/FileBackedOutputStream.java": [
+158,
+196,
+202
+],
+"com.google.guava:guava:src/com/google/common/io/Files.java": [
+148,
+424,
+427,
+428,
+465,
+682,
+696
+],
+"com.google.guava:guava:src/com/google/common/io/LittleEndianDataInputStream.java": [
+100,
+101,
+116,
+117,
+118,
+119,
+134,
+135,
+136,
+137,
+138,
+139,
+140,
+141
+],
+"com.google.guava:guava:src/com/google/common/io/LittleEndianDataOutputStream.java": [
+96
+],
+"com.google.guava:guava:src/com/google/common/io/Resources.java": [
+196,
+208
+],
+"com.google.guava:guava:src/com/google/common/math/BigIntegerMath.java": [
+221,
+299,
+300,
+325,
+420
+],
+"com.google.guava:guava:src/com/google/common/math/DoubleMath.java": [
+301,
+401,
+426,
+447
+],
+"com.google.guava:guava:src/com/google/common/math/DoubleUtils.java": [
+67,
+111
+],
+"com.google.guava:guava:src/com/google/common/math/IntMath.java": [
+105,
+209,
+383,
+385,
+468,
+541
+],
+"com.google.guava:guava:src/com/google/common/math/LongMath.java": [
+669,
+689,
+818,
+933
+],
+"com.google.guava:guava:src/com/google/common/net/HostAndPort.java": [
+171,
+214,
+215,
+223,
+298
+],
+"com.google.guava:guava:src/com/google/common/net/HostSpecifier.java": [
+78,
+100,
+127
+],
+"com.google.guava:guava:src/com/google/common/net/InetAddresses.java": [
+173,
+174,
+175,
+176,
+210,
+212,
+232,
+268,
+270,
+273,
+287,
+288,
+293,
+294,
+300,
+311,
+362,
+363,
+384,
+418,
+419,
+420,
+697,
+705,
+709,
+834,
+839,
+876,
+877,
+900,
+962,
+963,
+1025
+],
+"com.google.guava:guava:src/com/google/common/net/InternetDomainName.java": [
+170,
+231
+],
+"com.google.guava:guava:src/com/google/common/net/MediaType.java": [
+470,
+595,
+616,
+630,
+676,
+731,
+756,
+757
+],
+"com.google.guava:guava:src/com/google/common/net/PercentEscaper.java": [
+129,
+145,
+162,
+163,
+185,
+193,
+207,
+223
+],
+"com.google.guava:guava:src/com/google/common/primitives/Booleans.java": [
+153,
+154,
+197,
+201,
+202,
+236,
+257,
+259,
+291,
+325,
+326,
+448,
+460,
+469,
+480,
+495
+],
+"com.google.guava:guava:src/com/google/common/primitives/Bytes.java": [
+129,
+130,
+173,
+177,
+178,
+212,
+239,
+240,
+361,
+373,
+382,
+393
+],
+"com.google.guava:guava:src/com/google/common/primitives/Chars.java": [
+186,
+187,
+231,
+250,
+268,
+272,
+273,
+353,
+374,
+376,
+408,
+439,
+440,
+562,
+574,
+583,
+594
+],
+"com.google.guava:guava:src/com/google/common/primitives/Doubles.java": [
+178,
+179,
+225,
+243,
+259,
+263,
+264,
+335,
+361,
+363,
+395,
+427,
+428,
+553,
+565,
+574,
+585,
+604,
+606
+],
+"com.google.guava:guava:src/com/google/common/primitives/Floats.java": [
+174,
+175,
+221,
+239,
+255,
+259,
+260,
+331,
+357,
+359,
+391,
+423,
+424,
+548,
+560,
+569,
+580
+],
+"com.google.guava:guava:src/com/google/common/primitives/Ints.java": [
+193,
+194,
+238,
+257,
+275,
+279,
+280,
+402,
+423,
+425,
+456,
+457,
+488,
+489,
+560,
+572,
+610,
+622,
+631,
+642,
+654,
+657
+],
+"com.google.guava:guava:src/com/google/common/primitives/Longs.java": [
+162,
+163,
+207,
+226,
+244,
+248,
+249,
+271,
+272,
+437,
+458,
+460,
+492,
+524,
+525,
+646,
+658,
+667,
+678
+],
+"com.google.guava:guava:src/com/google/common/primitives/ParseRequest.java": [
+43
+],
+"com.google.guava:guava:src/com/google/common/primitives/Shorts.java": [
+192,
+193,
+237,
+256,
+274,
+278,
+279,
+400,
+421,
+423,
+455,
+487,
+488,
+609,
+621,
+630,
+641
+],
+"com.google.guava:guava:src/com/google/common/primitives/SignedBytes.java": [
+119,
+138,
+162,
+164,
+196
+],
+"com.google.guava:guava:src/com/google/common/primitives/UnsignedBytes.java": [
+144,
+145,
+146,
+165,
+166,
+167,
+235,
+261,
+263,
+393,
+394,
+395,
+430
+],
+"com.google.guava:guava:src/com/google/common/primitives/UnsignedInts.java": [
+94,
+115,
+140,
+142,
+171,
+222,
+227,
+258,
+285
+],
+"com.google.guava:guava:src/com/google/common/primitives/UnsignedLong.java": [
+229
+],
+"com.google.guava:guava:src/com/google/common/primitives/UnsignedLongs.java": [
+94,
+115,
+140,
+142,
+172,
+279,
+284,
+313,
+376,
+402
+],
+"com.google.guava:guava:src/com/google/common/reflect/ClassPath.java": [
+92,
+180,
+244,
+386,
+391,
+394
+],
+"com.google.guava:guava:src/com/google/common/reflect/Invokable.java": [
+121,
+292,
+316
+],
+"com.google.guava:guava:src/com/google/common/reflect/Reflection.java": [
+90
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeParameter.java": [
+47
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeResolver.java": [
+120,
+123,
+135,
+140,
+174,
+175,
+189,
+190,
+195,
+197,
+261,
+320,
+335,
+398,
+405,
+429,
+430
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeToken.java": [
+240,
+248,
+563,
+843,
+987,
+1070
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeVisitor.java": [
+75
+],
+"com.google.guava:guava:src/com/google/common/reflect/Types.java": [
+139,
+215,
+294,
+380,
+436,
+490,
+569
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
+45
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
+168,
+190,
+359,
+361,
+434,
+436,
+478,
+581,
+583,
+667,
+737,
+743,
+746,
+829
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
+532
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AbstractService.java": [
+190,
+278,
+302,
+337,
+360,
+429
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AggregateFuture.java": [
+59,
+75,
+135,
+167,
+168,
+244
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AtomicDouble.java": [
+94,
+117,
+167,
+169,
+185,
+187
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AtomicDoubleArray.java": [
+68,
+69,
+101,
+127,
+181,
+182,
+184,
+200,
+201,
+203,
+221,
+223,
+247,
+260,
+264
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/AtomicLongMap.java": [
+275
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Callables.java": [
+67,
+96
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/CollectionFuture.java": [
+49
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/CycleDetectingLockFactory.java": [
+333,
+338,
+342,
+592,
+683,
+708,
+743,
+761,
+776
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Futures.java": [
+761,
+1381,
+1657
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
+264,
+265
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/ListenerCallQueue.java": [
+77,
+102
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Monitor.java": [
+445,
+469,
+497,
+515,
+516,
+552,
+572,
+619,
+643,
+667,
+693,
+720,
+793,
+986,
+1031,
+1114
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/MoreExecutors.java": [
+187,
+195,
+587,
+597,
+700,
+824
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/SerializingExecutor.java": [
+142
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/ServiceManager.java": [
+271,
+475,
+588,
+589,
+632,
+690,
+698
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/SimpleTimeLimiter.java": [
+191
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Striped.java": [
+150,
+151,
+158,
+321,
+363,
+426,
+430
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/ThreadFactoryBuilder.java": [
+154,
+163
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Uninterruptibles.java": [
+57,
+82,
+108,
+139,
+172,
+202,
+228,
+255,
+279,
+321
+],
+"com.google.guava:guava:src/com/google/common/xml/XmlEscapers.java": [
+120,
+138
+],
+"com.google.guava:guava:src/com/google/thirdparty/publicsuffix/TrieParser.java": [
+41,
+66,
+67,
+117,
+120
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S6355.json b/its/ruling/src/test/resources/guava/java-S6355.json
new file mode 100644
index 00000000000..3036f123acf
--- /dev/null
+++ b/its/ruling/src/test/resources/guava/java-S6355.json
@@ -0,0 +1,210 @@
+{
+"com.google.guava:guava:src/com/google/common/base/CharMatcher.java": [
+923
+],
+"com.google.guava:guava:src/com/google/common/base/Converter.java": [
+363
+],
+"com.google.guava:guava:src/com/google/common/base/Objects.java": [
+130,
+148,
+164,
+189,
+202
+],
+"com.google.guava:guava:src/com/google/common/cache/LoadingCache.java": [
+130
+],
+"com.google.guava:guava:src/com/google/common/collect/ArrayTable.java": [
+374,
+488
+],
+"com.google.guava:guava:src/com/google/common/collect/ComparisonChain.java": [
+239
+],
+"com.google.guava:guava:src/com/google/common/collect/ContiguousSet.java": [
+192
+],
+"com.google.guava:guava:src/com/google/common/collect/FluentIterable.java": [
+111
+],
+"com.google.guava:guava:src/com/google/common/collect/GenericMapMaker.java": [
+48
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableBiMap.java": [
+313
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableClassToInstanceMap.java": [
+183
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableCollection.java": [
+198,
+210,
+222,
+234,
+246,
+258
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableList.java": [
+429,
+441,
+453,
+465
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableListMultimap.java": [
+336,
+348
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableMap.java": [
+392,
+404,
+416,
+428
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableMultimap.java": [
+365,
+377,
+389,
+419,
+431,
+443,
+455
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableMultiset.java": [
+239,
+251,
+263,
+275
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
+416,
+428
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMap.java": [
+481,
+795,
+807
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMapFauxverideShim.java": [
+36,
+50,
+64,
+79,
+94,
+109
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMultiset.java": [
+318,
+332
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedMultisetFauxverideShim.java": [
+43,
+57,
+71,
+85,
+99,
+114,
+129,
+144
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedSet.java": [
+700,
+714
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableSortedSetFauxverideShim.java": [
+45,
+59,
+73,
+87,
+102,
+117,
+132,
+146
+],
+"com.google.guava:guava:src/com/google/common/collect/ImmutableTable.java": [
+336,
+348,
+360,
+372
+],
+"com.google.guava:guava:src/com/google/common/collect/Iterables.java": [
+79
+],
+"com.google.guava:guava:src/com/google/common/collect/Iterators.java": [
+116,
+188,
+1251
+],
+"com.google.guava:guava:src/com/google/common/collect/MapConstraint.java": [
+55
+],
+"com.google.guava:guava:src/com/google/common/collect/MapConstraints.java": [
+52
+],
+"com.google.guava:guava:src/com/google/common/collect/MapMaker.java": [
+203,
+329,
+375,
+425,
+477,
+578
+],
+"com.google.guava:guava:src/com/google/common/collect/Multimaps.java": [
+489,
+718,
+813
+],
+"com.google.guava:guava:src/com/google/common/collect/Multisets.java": [
+91
+],
+"com.google.guava:guava:src/com/google/common/collect/Ordering.java": [
+176
+],
+"com.google.guava:guava:src/com/google/common/collect/Range.java": [
+445
+],
+"com.google.guava:guava:src/com/google/common/collect/Sets.java": [
+517
+],
+"com.google.guava:guava:src/com/google/common/collect/UnmodifiableIterator.java": [
+44
+],
+"com.google.guava:guava:src/com/google/common/collect/UnmodifiableListIterator.java": [
+42,
+52
+],
+"com.google.guava:guava:src/com/google/common/hash/BloomFilter.java": [
+147
+],
+"com.google.guava:guava:src/com/google/common/io/ByteArrayDataOutput.java": [
+48
+],
+"com.google.guava:guava:src/com/google/common/io/InputSupplier.java": [
+33
+],
+"com.google.guava:guava:src/com/google/common/io/LittleEndianDataOutputStream.java": [
+73
+],
+"com.google.guava:guava:src/com/google/common/io/OutputSupplier.java": [
+33
+],
+"com.google.guava:guava:src/com/google/common/reflect/TypeToken.java": [
+414,
+427
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/FutureFallback.java": [
+39
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/Futures.java": [
+425,
+496,
+733,
+1006,
+1056,
+1822,
+1880
+],
+"com.google.guava:guava:src/com/google/common/util/concurrent/MoreExecutors.java": [
+280
+]
+}
diff --git a/its/ruling/src/test/resources/guava/java-S7158.json b/its/ruling/src/test/resources/guava/java-S7158.json
index 72b47f1d0c8..7363b91df62 100644
--- a/its/ruling/src/test/resources/guava/java-S7158.json
+++ b/its/ruling/src/test/resources/guava/java-S7158.json
@@ -1,13 +1,25 @@
 {
+"com.google.guava:guava:src/com/google/common/base/CharMatcher.java": [
+1040,
+1063,
+1090,
+1156
+],
 "com.google.guava:guava:src/com/google/common/base/Splitter.java": [
 176
 ],
 "com.google.guava:guava:src/com/google/common/base/Strings.java": [
 78
 ],
+"com.google.guava:guava:src/com/google/common/io/CharSource.java": [
+423
+],
 "com.google.guava:guava:src/com/google/common/io/Files.java": [
 730
 ],
+"com.google.guava:guava:src/com/google/common/io/LineBuffer.java": [
+104
+],
 "com.google.guava:guava:src/com/google/common/net/InetAddresses.java": [
 233,
 247,
diff --git a/its/ruling/src/test/resources/guava/java-S7476.json b/its/ruling/src/test/resources/guava/java-S7476.json
new file mode 100644
index 00000000000..b3377fdad4b
--- /dev/null
+++ b/its/ruling/src/test/resources/guava/java-S7476.json
@@ -0,0 +1,9 @@
+{
+"com.google.guava:guava:src/com/google/common/util/concurrent/CycleDetectingLockFactory.java": [
+477,
+799,
+811,
+884,
+896
+]
+}
diff --git a/its/sources b/its/sources
index c581e479379..89a7cc810ae 160000
--- a/its/sources
+++ b/its/sources
@@ -1 +1 @@
-Subproject commit c581e47937904f613681539c05d352a23e04e026
+Subproject commit 89a7cc810aed0762a8aee81704afc1fdfb379008
diff --git a/pom.xml b/pom.xml
index 6051fd6b4a5..cf2dda48ef6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
     <sonarlint.plugin.api.version>10.13.0.79996</sonarlint.plugin.api.version>
     <sonar.sca.exclusions>its/**,java-checks-test-sources/**</sonar.sca.exclusions>
     <analyzer.commons.version>2.18.0.3393</analyzer.commons.version>
-    <orchestrator.version>5.6.2.2625</orchestrator.version>
+    <orchestrator.version>6.1.0.3962</orchestrator.version>
     <sslr.version>1.24.0.633</sslr.version>
     <argLine>-Xmx512m</argLine>
     <gitRepositoryName>sonar-java</gitRepositoryName>