diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S1128.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S1128.json
index 21d81b7ba9e..e7a4ef16fdb 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S1128.json
@@ -1,5 +1,9 @@
 {
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java": [
+19,
 24
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java": [
+30
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S1130.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S1130.json
index 269f85f020b..0991f83f781 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S1130.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S1130.json
@@ -1,22 +1,358 @@
 {
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanUtils.java": [
+67,
+67,
+68,
+68,
+95,
+95,
+118,
+118,
+142,
+142,
+143,
+168,
+168,
+169,
+195,
+195,
+196,
+225,
+225,
+226,
+253,
+253,
+254,
+282,
+282,
+283,
+311,
+311,
+312,
+339,
+339,
+340,
+366,
+366,
+367,
+391,
+391,
+414,
+414
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java": [
+141,
+142,
+143,
+254,
+255,
+256
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/DynaProperty.java": [
+290,
+349
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java": [
+177
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/MethodUtils.java": [
+259,
+260,
+382,
+383,
+432,
+433,
+582,
+583
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/PropertyUtils.java": [
+128,
+128,
+129,
+154,
+154,
+155,
+186,
+186,
+187,
+219,
+219,
+220,
+246,
+246,
+247,
+275,
+275,
+276,
+322,
+322,
+323,
+353,
+353,
+354,
+387,
+387,
+388,
+458,
+458,
+459,
+491,
+491,
+492,
+538,
+538,
+539,
+635,
+635,
+636,
+668,
+668,
+669,
+696,
+696,
+697,
+724,
+724,
+725,
+755,
+755,
+756,
+785,
+785,
+786,
+817,
+817,
+818
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java": [
+2100,
+2101
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java": [
+122,
+122,
+123,
+150,
+150,
+151,
+179,
+179,
+180,
+208,
+208,
+209,
+235,
+235,
+236,
+262,
+262,
+263,
+291,
+291,
+292,
+321,
+321,
+322,
+350,
+350,
+351,
+379,
+379,
+380,
+407,
+407,
+408,
+433,
+433,
+434,
+461,
+461,
+462,
+488,
+488,
+489,
+513,
+513,
+538,
+538,
+561,
+561,
+619,
+619
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanIntrospectionDataTestCase.java": [
+83
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java": [
+360,
+366
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java": [
+177,
+210,
+243,
+276,
+309,
+343
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java": [
+861,
+901,
+914,
+999,
+1020,
+1041,
+1064,
+1087,
+1099,
+1121,
+1143,
+1226,
+1247,
+1268,
+1289,
+1310,
+1332,
+1369,
+1392,
+1427,
+1440,
+1459,
+1494,
+1537,
+1581
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java": [
+95,
 129,
+180,
+267,
+317,
+361,
+423,
 469
 ],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java": [
+78,
+93,
+99,
+108,
+129,
+152,
+158,
+178,
 218,
-235
+235,
+249
 ],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java": [
 543,
 602,
 620
 ],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java": [
+897,
+937,
+950,
+962,
+985,
+1006,
+1027,
+1050,
+1073,
+1085,
+1109,
+1150,
+1173
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java": [
+293
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospectorTestCase.java": [
 77,
 97
 ],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java": [
+126,
+143,
+159,
+169,
+179,
+189,
+203,
+217,
+227,
+239,
+251,
+261,
+271,
+283,
+292,
+301,
+314,
+327,
+336,
+345,
+378,
+387,
+401,
+417,
+426,
+436,
+445
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java": [
+122,
+130,
+139,
+149,
+157,
+167,
+176,
+186,
+195,
+209,
+222,
+231,
+241,
+247,
+253,
+259,
+265,
+271,
+277,
+305,
+311,
+535,
+581,
+597,
+608,
+618
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java": [
+166,
+199,
+232
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java": [
+432,
+1673,
+2463,
+4096,
+4173,
+4192,
+4209,
+4279,
+4369,
+4403,
+4440
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/SuppressPropertiesBeanIntrospectorTestCase.java": [
+48,
+67
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/TestResultSet.java": [
+144,
 159,
 202,
 206,
@@ -28,13 +364,87 @@
 116,
 120
 ],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java": [
+263
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java": [
+80,
+89
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java": [
+132
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java": [
 107
 ],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java": [
+81,
+95
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java": [
+101,
+115,
+127
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java": [
+80
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java": [
+80,
+97,
+110
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira411TestCase.java": [
+40
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira422TestCase.java": [
+52,
+65,
+72
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira422bTestCase.java": [
+33,
+41
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira454TestCase.java": [
+31
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira456TestCase.java": [
+54
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java": [
 57,
 58
 ],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira492TestCase.java": [
+58,
+64,
+70,
+76,
+81,
+86,
+94,
+101,
+111
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira493TestCase.java": [
+34
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java": [
+55
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira520TestCase.java": [
+34
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira92TestCase.java": [
+35
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/other/Jira492IndexedListsSupport.java": [
+51
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java": [
+81
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java": [
 80
 ],
@@ -44,15 +454,12 @@
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/ClassReloader.java": [
 57
 ],
-"commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java": [
-79
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java": [
+49
 ],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java": [
 72
 ],
-"commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java": [
-79
-],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java": [
 80
 ],
@@ -66,9 +473,22 @@
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java": [
 79
 ],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/converters/URLConverterTestCase.java": [
+72
+],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java": [
+104,
 135,
+184,
+262,
+308,
+352,
+422,
 468,
 480
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java": [
+477,
+510
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S1226.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S1226.json
new file mode 100644
index 00000000000..02f0c2b46bf
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S1226.json
@@ -0,0 +1,91 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java": [
+83
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanMap.java": [
+762
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java": [
+362,
+414,
+434,
+900
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java": [
+107,
+146,
+149,
+219,
+259,
+263
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java": [
+185
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java": [
+650
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/MethodUtils.java": [
+214,
+263,
+266,
+344,
+386,
+390,
+436,
+440,
+536,
+586,
+589,
+668,
+787,
+808,
+815,
+872,
+1137,
+1327
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java": [
+439,
+604,
+786,
+787,
+791,
+793,
+795,
+797,
+834,
+930,
+931,
+935,
+1121,
+1122,
+1126,
+1354,
+1355,
+1359,
+1364,
+1443,
+1444,
+1448,
+1453,
+1540,
+1719,
+1885,
+1886,
+1964
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java": [
+145
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java": [
+442,
+444
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java": [
+674
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java": [
+274
+]
+}
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2175.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2175.json
new file mode 100644
index 00000000000..be536a17d2f
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2175.json
@@ -0,0 +1,12 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java": [
+159,
+162,
+206,
+209,
+223,
+226,
+293,
+299
+]
+}
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2209.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2209.json
new file mode 100644
index 00000000000..f55c6be1bb9
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2209.json
@@ -0,0 +1,6 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java": [
+1364,
+1453
+]
+}
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2221.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2221.json
index c16ae298552..eae83f866e0 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2221.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2221.json
@@ -20,15 +20,11 @@
 ],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/LazyDynaList.java": [
 529,
-589,
 658
 ],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java": [
 283
 ],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java": [
-243
-],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java": [
 530
 ],
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2325.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2325.json
index b3e37359d43..0a3a61cac58 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2325.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2325.json
@@ -2,6 +2,9 @@
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java": [
 353
 ],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java": [
+538
+],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/DynaProperty.java": [
 290,
 349
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2387.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2387.json
new file mode 100644
index 00000000000..a0950531d1e
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2387.json
@@ -0,0 +1,14 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java": [
+82
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java": [
+48
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java": [
+47
+],
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java": [
+50
+]
+}
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2658.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2658.json
index babbbc19b7b..e2b8fc1536d 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S2658.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S2658.json
@@ -6,9 +6,6 @@
 514,
 523
 ],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java": [
-241
-],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/ClassConverter.java": [
 94,
 103
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S3032.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S3032.json
index 6bf7a2fd23e..2b15d27693b 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S3032.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S3032.json
@@ -5,9 +5,6 @@
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java": [
 521
 ],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java": [
-241
-],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/ClassConverter.java": [
 102
 ]
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S3242.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S3242.json
new file mode 100644
index 00000000000..0ee8cc33919
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S3242.json
@@ -0,0 +1,5 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanMap.java": [
+267
+]
+}
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S3252.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S3252.json
new file mode 100644
index 00000000000..f55c6be1bb9
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S3252.json
@@ -0,0 +1,6 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java": [
+1364,
+1453
+]
+}
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S5785.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S5785.json
index df0f33ac2f7..a3aa29f6a50 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S5785.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S5785.json
@@ -96,10 +96,7 @@
 117,
 126,
 127,
-191,
-208,
-217,
-223
+191
 ],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java": [
 295,
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S9345.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S9345.json
index f48b792ff59..b3765180e26 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S9345.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S9345.json
@@ -2,37 +2,17 @@
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java": [
 78
 ],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanPredicate.java": [
-49
-],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java": [
-117,
 134
 ],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java": [
-149,
 164
 ],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java": [
-103,
 119
 ],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java": [
-111,
-124,
-136
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java": [
-158
-],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java": [
-97,
-110
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java": [
-172,
-181,
-192
+97
 ],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java": [
 85,
@@ -42,9 +22,6 @@
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/MethodUtils.java": [
 1319
 ],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java": [
-128
-],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java": [
 100,
 128,
@@ -63,61 +40,5 @@
 ],
 "commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java": [
 150
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java": [
-70,
-83,
-97,
-111
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java": [
-92,
-104,
-118
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java": [
-118
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java": [
-69,
-82,
-94,
-107,
-120,
-134,
-148,
-162,
-175,
-189,
-204,
-219
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java": [
-59,
-72,
-84,
-97,
-110,
-124,
-138,
-152,
-165,
-179,
-193,
-208
-],
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java": [
-63,
-76,
-88,
-101,
-114,
-128,
-142,
-156,
-169,
-183,
-197,
-212
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S9357.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S9357.json
index 8de5fa38ff1..a35512850b9 100644
--- a/its/ruling/src/test/resources/expected/commons-beanutils/java-S9357.json
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S9357.json
@@ -1,14 +1,4 @@
 {
-"commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanMap.java": [
-74,
-83,
-92,
-101,
-110,
-119,
-128,
-137
-],
 "commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java": [
 60
 ]
diff --git a/its/ruling/src/test/resources/expected/commons-beanutils/java-S9396.json b/its/ruling/src/test/resources/expected/commons-beanutils/java-S9396.json
new file mode 100644
index 00000000000..5a7a5549fe2
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/commons-beanutils/java-S9396.json
@@ -0,0 +1,28 @@
+{
+"commons-beanutils:src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java": [
+659,
+660,
+661
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanWithInnerBean.java": [
+35
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java": [
+488,
+489,
+490,
+491,
+492,
+493
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira411TestCase.java": [
+46
+],
+"commons-beanutils:src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java": [
+533,
+534,
+535,
+536,
+537
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S112.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S112.json
index 5ad5c72d34c..40870419428 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S112.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S112.json
@@ -5,14 +5,21 @@
 "eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java": [
 173
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java": [
-359
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java": [
 213
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
-938
+920,
+938,
+978,
+1014
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java": [
+237
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java": [
+400,
+771
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java": [
 67,
@@ -28,10 +35,13 @@
 252,
 603
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java": [
+143
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java": [
 454,
 475,
-722,
+629,
 766
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionCache.java": [
@@ -58,7 +68,8 @@
 26
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
-942
+942,
+1332
 ],
 "eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java": [
 308
@@ -89,6 +100,10 @@
 65,
 73
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java": [
+172,
+183
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java": [
 190
 ],
@@ -101,6 +116,9 @@
 61
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+1099,
+1112,
+1136,
 1141,
 1199
 ],
@@ -108,6 +126,10 @@
 42,
 44
 ],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
+307,
+321
+],
 "eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java": [
 128
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1128.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1128.json
index caf8ad69f1a..3d9a3aafc4c 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1128.json
@@ -1,7 +1,48 @@
 {
+"eclipse-jetty:jetty-http/src/main/java/module-info.java": [
+19,
+20
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java": [
 23
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java": [
+53
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java": [
+23
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/AsyncCompletionTest.java": [
+43
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpOutputTest.java": [
+33
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java": [
+31
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/session/HouseKeeperTest.java": [
+28
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java": [
+25
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java": [
+37
+],
+"eclipse-jetty:jetty-slf4j-impl/src/main/java/module-info.java": [
+19,
+20
+],
+"eclipse-jetty:jetty-util/src/main/java/module-info.java": [
+19
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MemoryUtils.java": [
+22
+],
+"eclipse-jetty:jetty-xml/src/main/java/module-info.java": [
+19
+],
 "eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
 67
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1130.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1130.json
index b1e41fcfa4f..bd0125bee4b 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1130.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1130.json
@@ -1,50 +1,250 @@
 {
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java": [
-197,
 358
 ],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/GZIPContentDecoderTest.java": [
+89,
+102,
+126,
+139,
+156,
+181,
+209,
+235,
+270,
+296,
+324,
+369
+],
 "eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpCookieTest.java": [
-78,
-114
+78
 ],
 "eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java": [
-33,
 78,
 95,
 165,
 172,
-247,
-267,
 276
 ],
 "eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/pathmap/PathMappingsTest.java": [
 171,
 273
 ],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java": [
+296
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/IncludeExcludeConnectionStatistics.java": [
+53
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
+149,
+183,
+351
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java": [
+257,
+343,
+353
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
+389,
+394,
+449,
+454
+],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/CyclicTimeoutTest.java": [
+66,
+77,
+89,
+102,
+115,
+128
+],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/IOTest.java": [
+73,
+210,
+278,
+352,
+452
+],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/IdleTimeoutTest.java": [
+72,
+84,
+96,
+109,
+122,
+144,
+157
+],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/NIOTest.java": [
+40
+],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointOpenCloseTest.java": [
+45,
+52,
+58
+],
 "eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java": [
+331,
+371,
 411
 ],
+"eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java": [
+196,
+240
+],
+"eclipse-jetty:jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerTest.java": [
+153,
+194
+],
+"eclipse-jetty:jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java": [
+109
+],
+"eclipse-jetty:jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanUtilTest.java": [
+73,
+92,
+103,
+135,
+146,
+213
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
+424
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
+579,
+579
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java": [
+137,
+137
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java": [
+522,
+522
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java": [
+273
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
+248
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
+155,
+221
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
+563
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceContentFactory.java": [
 71
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java": [
+824
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Response.java": [
+901
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Server.java": [
+648,
+648,
+661,
 776
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java": [
+390,
 433
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java": [
-213
+213,
+426
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
-938
+938,
+978,
+1014,
+1844
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java": [
+369,
+427,
+600
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java": [
+107,
+186,
+237
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java": [
+71,
+157
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java": [
+321,
+341,
+364,
+390,
+410,
+430
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java": [
+74
 ],
-"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java": [
-56
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/AsyncCompletionTest.java": [
+118
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java": [
+189,
+234,
+234
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/CustomResourcesMonitorTest.java": [
+82
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/DelayedServerTest.java": [
+36
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java": [
+55
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java": [
+51
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java": [
+134,
+247,
 265
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java": [
+206,
+444,
+457,
+471,
+485,
+494,
+502,
+510,
+518,
+526,
+534,
+542,
+564,
+577,
+599,
+622,
+639,
+659,
+680,
+700,
+751,
+800,
+813,
+823,
+834,
+844,
+863,
+1011
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpInputAsyncStateTest.java": [
 275,
 291,
@@ -70,11 +270,33 @@
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpInputTest.java": [
 198,
+210,
+254,
+282,
+311,
+337,
 362,
+379,
+429,
+450,
 497,
 528,
 538,
-548
+548,
+574,
+595
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpOutputTest.java": [
+110,
+117,
+124
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java": [
+1548,
+1548
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java": [
+58
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java": [
 243
@@ -83,51 +305,299 @@
 40,
 77
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java": [
+93,
+101,
+109,
+120,
+131,
+142,
+154,
+166,
+396
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/LowResourcesMonitorTest.java": [
+170,
+192
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartFormInputStreamTest.java": [
+100,
+123,
+228,
+374,
+580,
+739,
+761,
+853,
+951,
+1073
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java": [
-388
+132,
+388,
+412,
+424,
+442,
+492,
+507,
+547,
+563
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java": [
+201,
+236,
+293,
+329,
+378,
+524,
+560,
+595,
+622,
+645,
+664,
+761,
+912,
+1324,
+1596,
 1777
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java": [
+103
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java": [
-567
+190,
+295,
+310,
+334,
+539,
+567,
+578,
+605,
+679,
+693,
+748,
+771,
+840,
+1092,
+1102,
+1278,
+1431
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java": [
+27
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java": [
+29
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java": [
+99,
+292
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java": [
+52,
 60
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServletRequestWrapperTest.java": [
+55
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java": [
+47
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasCheckerTest.java": [
+94
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/BufferedResponseHandlerTest.java": [
+99,
+112,
+122,
+135,
+149,
+160,
+171,
+182,
+194,
+206,
+221
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java": [
+220,
 246
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerGetResourceTest.java": [
-138
+138,
+239,
+304,
+323
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java": [
-640
+640,
+758,
+797,
+819
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java": [
+140,
+154
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java": [
+101,
+622
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerTest.java": [
+160,
+185,
+197,
+209,
+219
 ],
-"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/ThreadLimitHandlerTest.java": [
-54
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java": [
+851
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/resource/RangeWriterTest.java": [
+56,
+64,
+79,
+79,
+119,
+130,
+145,
+164,
+183
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java": [
+332
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java": [
-334
+158,
+223,
+228
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java": [
+135
+],
+"eclipse-jetty:jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/Slf4jEffort.java": [
+231,
+242
+],
+"eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java": [
+195
+],
+"eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java": [
+308
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java": [
+564,
+578,
+593,
+1038
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ByteArrayISO8859Writer.java": [
+98
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java": [
+48,
+53
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java": [
+85,
+85,
+86,
+86
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/IO.java": [
+146,
+188,
+441
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Loader.java": [
+61
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartOutputStream.java": [
+44,
 54
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartWriter.java": [
+42
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java": [
+916,
+1055
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java": [
+285
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java": [
+359,
+381
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java": [
+487
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java": [
+345,
+423,
+491
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java": [
+102,
+219
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java": [
+95
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java": [
+41,
+51,
+69
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/EmptyResource.java": [
 125
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java": [
+266
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java": [
+456
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java": [
+90,
 219,
-420
+420,
+922
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java": [
 290
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateUtils.java": [
+61
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+411,
+1607,
+1622,
+1634,
+1657,
+1657,
+1681,
+1706,
+1736,
+1760
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/X509.java": [
+67,
+67
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java": [
+286,
+845
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/BlockingArrayQueueTest.java": [
 44,
 84,
 106,
 119,
+170,
+214,
 347,
 369,
 403,
@@ -142,22 +612,96 @@
 95,
 119,
 143,
+162,
 179,
-294
+241,
+294,
+358
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/DateCacheTest.java": [
+41
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/FutureCallbackTest.java": [
 47,
+57,
+70,
 100,
-148
+116,
+148,
+162
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeSetTest.java": [
+31
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/InetAddressSetTest.java": [
+64,
+72,
+135,
+212,
+262,
+302
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/IntrospectionUtilTest.java": [
 64
 ],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java": [
+39,
+46,
+267,
+324
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/LeakDetectorTest.java": [
+33,
+39
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/LoaderTest.java": [
+50
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java": [
+35,
+49,
+142,
+207
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/MultiReleaseJarFileTest.java": [
+42,
+51,
+75,
+103,
+126
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherDemo.java": [
+65
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java": [
+234,
+295
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/QueueBenchmarkTest.java": [
 88
 ],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java": [
+372,
+380
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/ScannerTest.java": [
-445
+56,
+107,
+126,
+201,
+445,
+452
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/TestIntrospectionUtil.java": [
+109,
+131,
+147,
+160,
+173,
+186,
+201,
+214,
+227
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java": [
 65,
@@ -169,34 +713,226 @@
 201,
 222
 ],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/TypeUtilTest.java": [
+59,
+85,
+165
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java": [
 502,
-518
+518,
+667,
+667
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java": [
+224
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/Utf8AppendableTest.java": [
+61,
 76,
 93,
-149
+112,
+128,
+149,
+161,
+181,
+201,
+220,
+239
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java": [
+43,
+76,
+126,
+137,
+351,
+521,
+562,
+648,
+671,
+708
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/component/DumpableTest.java": [
 32,
 40
 ],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerNestedTest.java": [
+179,
+214,
+250
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java": [
+115
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java": [
+1517,
+1527
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/JarResourceTest.java": [
+57,
+95,
+107,
+125,
+184,
+194,
+222,
+246,
+265,
+270
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/JrtResourceTest.java": [
+42,
+59,
+76,
+92,
+104
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java": [
+44,
+44,
+68,
+68,
+92,
+92,
+113
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceAliasTest.java": [
+50,
+87
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java": [
+242
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java": [
-80
+61,
+70,
+80,
+89,
+98,
+115,
+268,
+280,
+291
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/security/CredentialTest.java": [
-35,
-54,
 66
 ],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java": [
+74,
+88,
+139,
+149,
+164,
+171,
+178,
+193,
+241,
+255,
+279,
+319,
+337,
+346,
+355
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java": [
+132,
+142,
+152,
+162
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/statistic/CounterStatisticTest.java": [
-36
+36,
+80
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/statistic/RateStatisticTest.java": [
 33
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/statistic/SampleStatisticTest.java": [
 51
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/AutoLockTest.java": [
+73
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/EatWhatYouKillTest.java": [
+38,
+55
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java": [
+153,
+182,
+369,
+412,
+465,
+513,
+624,
+740,
+760,
+778
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/ReservedThreadExecutorTest.java": [
+61,
+70,
+208,
+271
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/SchedulerTest.java": [
+52
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/SerializedExecutorTest.java": [
+36
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/SweeperTest.java": [
+37,
+44,
+61
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/ThreadFactoryTest.java": [
+34
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsumeTest.java": [
+124,
+156,
+188,
+265
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/ExecutionStrategyTest.java": [
+59,
+68,
+75
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java": [
+58,
+76,
+84,
+92,
+98,
+140,
+163
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
+411,
+707,
+707,
+707,
+715,
+715,
+723,
+731
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java": [
+195
+],
+"eclipse-jetty:jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java": [
+31
+],
+"eclipse-jetty:jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java": [
+689,
+1527
+],
+"eclipse-jetty:jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java": [
+30
+],
+"eclipse-jetty:tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/HttpTester.java": [
+211
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1144.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1144.json
index ab7b39507a6..910533b9e46 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1144.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1144.json
@@ -1,6 +1,85 @@
 {
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
-433
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/CookieCompliance.java": [
+45
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java": [
+62
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java": [
+62
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeader.java": [
+158
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeaderValue.java": [
+60
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpScheme.java": [
+50
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java": [
+179
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java": [
+108
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java": [
+90,
+101,
+113
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerHTTPTest.java": [
+304
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
+309
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
+279,
+284,
+289,
+295,
+322,
+420,
+438
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java": [
+991,
+1007,
+1024
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelListeners.java": [
+260,
+273
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
+852
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
+65
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java": [
+286
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java": [
+122
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java": [
+1021
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLReadEOFAfterResponseTest.java": [
+150
+],
+"eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLevel.java": [
+39,
+45
+],
+"eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLogger.java": [
+641,
+648
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/TreeTrie.java": [
+73
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/TestIntrospectionUtil.java": [
 71,
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1162.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1162.json
index 9f6fb35a8de..8a7514ced77 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1162.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1162.json
@@ -70,9 +70,6 @@
 1902,
 2844
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java": [
-150
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/resource/SeekableByteChannelRangeWriter.java": [
 154,
 160
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S117.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S117.json
index 051af20cfdf..4b5312edb64 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S117.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S117.json
@@ -8,9 +8,6 @@
 393,
 404
 ],
-"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java": [
-533
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
 472
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1172.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1172.json
index 2bcc44ef51a..1cc1654f4e9 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1172.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1172.json
@@ -20,9 +20,6 @@
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java": [
 177
 ],
-"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java": [
-112
-],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java": [
 243
 ],
@@ -32,12 +29,6 @@
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java": [
 622
 ],
-"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java": [
-93
-],
-"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java": [
-334
-],
 "eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java": [
 100
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1181.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1181.json
index d44bec78066..75f6e95a9b9 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1181.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1181.json
@@ -1,14 +1,4 @@
 {
-"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java": [
-1594
-],
-"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/PreEncodedHttpField.java": [
-55
-],
-"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java": [
-221,
-249
-],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java": [
 263,
 285
@@ -19,7 +9,6 @@
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
 176,
 206,
-335,
 399,
 412,
 539,
@@ -33,7 +22,6 @@
 1034
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java": [
-76,
 124
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSocketChannelEndPoint.java": [
@@ -57,9 +45,6 @@
 297,
 398
 ],
-"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslClientConnectionFactory.java": [
-168
-],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
 540,
 775,
@@ -97,22 +82,22 @@
 674,
 735
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java": [
-86
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
+346
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
 216
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java": [
+394
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java": [
-414,
 427,
-516,
 551,
 569,
 649,
 787,
 820,
-878,
 999,
 1016,
 1032
@@ -124,7 +109,6 @@
 1006
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
-596,
 705,
 859,
 934,
@@ -135,9 +119,6 @@
 1466,
 1552
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
-627
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
 200,
 229,
@@ -154,10 +135,7 @@
 152
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Server.java": [
-405,
 431,
-442,
-451,
 493,
 509,
 520
@@ -204,6 +182,13 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java": [
 49
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ManifestUtils.java": [ning.java": [
+46,
+76
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java": [
+49
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ManifestUtils.java": [
 54,
 82
@@ -234,6 +219,9 @@
 77,
 189
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java": [
+622
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java": [
 110,
 140
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1185.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1185.json
index bdf77ec9e34..87eaf6acb68 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1185.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1185.json
@@ -1,18 +1,4 @@
 {
-"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
-508
-],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AcceptRateLimit.java": [
-269
-],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java": [
-85,
-91
-],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java": [
-142,
-148
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/HostMap.java": [
 51,
 58
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1226.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1226.json
new file mode 100644
index 00000000000..f8063e2858a
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1226.json
@@ -0,0 +1,316 @@
+{
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java": [
+519
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java": [
+156
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java": [
+562
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java": [
+802,
+806,
+812,
+816,
+820,
+825,
+832,
+836,
+852,
+857,
+863,
+870,
+876,
+882,
+898,
+908,
+915,
+921,
+933,
+939,
+949,
+970,
+975,
+995,
+1001,
+1012,
+1017,
+1022,
+1045,
+1051,
+1056,
+1074
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java": [
+185,
+187,
+189,
+191,
+198,
+200
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java": [
+94,
+96,
+98
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java": [
+225
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java": [
+97
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java": [
+277,
+447,
+461
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
+918
+],
+"eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java": [
+306,
+412
+],
+"eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java": [
+235,
+242,
+424
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnectionFactory.java": [
+121
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
+189,
+193,
+221
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java": [
+53
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java": [
+66
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
+597,
+629,
+841
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java": [
+87,
+89,
+144,
+146
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java": [
+59,
+60
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java": [
+636,
+778,
+844
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java": [
+362
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java": [
+900
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
+800,
+801,
+848
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpWriter.java": [
+68,
+69
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java": [
+66,
+67
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
+67
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Request.java": [
+188,
+1248,
+1262
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/RequestLogWriter.java": [
+79,
+81
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Response.java": [
+515,
+522,
+531,
+596,
+646,
+1096,
+1393
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java": [
+311,
+425,
+481
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java": [
+178,
+179
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
+1241,
+1248,
+1253,
+1258,
+1478,
+1616,
+1621,
+1627,
+1909,
+1993,
+1999,
+2028,
+2033,
+2035,
+2229,
+2231
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java": [
+359,
+527
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java": [
+157
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java": [
+277,
+340,
+355,
+391,
+406,
+434,
+449
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java": [
+289,
+299,
+327,
+337,
+366,
+376
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ArrayUtil.java": [
+89,
+117
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Attributes.java": [
+54,
+71
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java": [
+837,
+860,
+874,
+877,
+900,
+914,
+917,
+940,
+1143
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java": [
+73
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/IO.java": [
+161,
+205,
+463,
+464,
+468
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/LazyList.java": [
+152,
+168
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java": [
+161,
+165,
+173,
+175
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java": [
+887
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java": [
+357,
+388,
+568
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java": [
+120,
+126,
+424
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java": [
+98,
+182,
+545,
+868
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java": [
+152,
+154
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java": [
+265
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java": [
+483,
+883
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java": [
+295
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java": [
+51
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java": [
+161,
+196,
+211
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java": [
+174
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java": [
+364,
+383,
+417
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+1119
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/X509.java": [
+106,
+136
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java": [
+141
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java": [
+77,
+87
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
+530,
+804,
+818,
+824,
+836,
+870
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S125.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S125.json
index 16f4ee8f38b..a72560b18fd 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S125.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S125.json
@@ -37,6 +37,8 @@
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java": [
 136,
+136,
+136,
 182,
 192,
 210,
@@ -88,6 +90,8 @@
 127,
 158,
 190,
+219,
+219,
 219
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java": [
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S131.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S131.json
index 94f6d1f542d..920e1a55a7b 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S131.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S131.json
@@ -1,4 +1,7 @@
 {
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerHTTPTest.java": [
+149
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java": [
 811
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1604.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1604.json
index 500790c2d20..15306940fe1 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1604.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1604.json
@@ -7,8 +7,5 @@
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
 297
-],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MemoryUtils.java": [
-37
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1643.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1643.json
index 911bba6f205..03a17910726 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1643.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1643.json
@@ -8,6 +8,11 @@
 329,
 351
 ],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerHTTPTest.java": [
+176,
+181,
+186
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java": [
 271,
 273
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1939.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1939.json
index 954708884da..8b0b683ce23 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1939.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S1939.json
@@ -2,9 +2,6 @@
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java": [
 514
 ],
-"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java": [
-41
-],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
 64
 ],
@@ -17,18 +14,12 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
 142
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessSet.java": [
-33
-],
 "eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLogger.java": [
 28
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java": [
 347
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/InetAddressSet.java": [
-39
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java": [
 48
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2109.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2109.json
new file mode 100644
index 00000000000..12a1318ad46
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2109.json
@@ -0,0 +1,5 @@
+{
+"eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java": [
+240
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2142.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2142.json
index cd9fd28bade..81ba1998735 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2142.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2142.json
@@ -3,20 +3,12 @@
 738
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
-674,
 726,
 735
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java": [
 82
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java": [
-279,
-305
-],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Server.java": [
-493
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java": [
 207
 ],
@@ -48,7 +40,6 @@
 916
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java": [
-281,
 318
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2160.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2160.json
index 244cdac6b19..bbdcdb25cf6 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2160.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2160.json
@@ -15,6 +15,15 @@
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java": [
 30
 ],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java": [
+24
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java": [
+26
+],
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java": [
+41
+],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/IncludeExcludeConnectionStatistics.java": [
 78
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2175.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2175.json
new file mode 100644
index 00000000000..52eeb1277fd
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2175.json
@@ -0,0 +1,6 @@
+{
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslClientConnectionFactory.java": [
+105,
+157
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2184.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2184.json
index ab44f94f89b..01bf7181824 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2184.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2184.json
@@ -3,5 +3,11 @@
 290,
 325,
 330
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
+1166
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java": [
+866
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2185.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2185.json
new file mode 100644
index 00000000000..b663f0dba58
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2185.json
@@ -0,0 +1,5 @@
+{
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
+1166
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2187.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2187.json
new file mode 100644
index 00000000000..124caff7e4e
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2187.json
@@ -0,0 +1,92 @@
+{
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/CookieCutterLenientTest.java": [
+37
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerHTTPTest.java": [
+38
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java": [
+35
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/pathmap/ServletPathSpecMatchListTest.java": [
+36
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/pathmap/ServletPathSpecOrderTest.java": [
+35
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/pathmap/UriTemplatePathSpecBadSpecsTest.java": [
+32
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/AsyncCompletionTest.java": [
+71
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/DelayedServerTest.java": [
+33
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java": [
+51
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java": [
+45
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartCaptureTest.java": [
+59
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java": [
+40
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java": [
+26
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java": [
+24
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java": [
+26
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java": [
+62
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasCheckerTest.java": [
+52
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/InetAccessHandlerTest.java": [
+47
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java": [
+61
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/resource/RangeWriterTest.java": [
+50
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java": [
+33
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/HostPortTest.java": [
+32
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/PoolTest.java": [
+41
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java": [
+37
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilCanonicalPathTest.java": [
+31
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/Utf8AppendableTest.java": [
+43
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java": [
+78
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java": [
+23
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/SchedulerTest.java": [
+40
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/ExecutionStrategyTest.java": [
+45
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2209.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2209.json
new file mode 100644
index 00000000000..1f6296f64b0
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2209.json
@@ -0,0 +1,5 @@
+{
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java": [
+81
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2221.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2221.json
index af2bd559d4e..4482021172a 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2221.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2221.json
@@ -1,7 +1,4 @@
 {
-"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java": [
-208
-],
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/DateParser.java": [
 84,
 100
@@ -13,7 +10,6 @@
 487
 ],
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java": [
-252,
 432
 ],
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java": [
@@ -42,9 +38,6 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
 263
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelListeners.java": [
-124
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java": [
 90
 ],
@@ -52,8 +45,7 @@
 244
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java": [
-279,
-305
+279
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
 453,
@@ -105,10 +97,19 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java": [
 140
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java": [
+739,
+842
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java": [
+96,
+169
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCache.java": [
 152
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java": [
+306,
 366
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java": [
@@ -123,9 +124,15 @@
 885
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
+365,
+387,
 904,
 924,
+930,
+1138,
+1150,
 1199,
+1214,
 1249,
 1255
 ],
@@ -179,6 +186,9 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java": [
 74
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/StopLifeCycle.java": [
+51
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java": [
 45
 ],
@@ -214,6 +224,9 @@
 714,
 1952
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java": [
+151
+],
 "eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
 190,
 597
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2250.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2250.json
index a9928fb3f70..b693aca152a 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2250.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2250.json
@@ -83,7 +83,6 @@
 663
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java": [
-73,
 79
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java": [
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2293.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2293.json
index d485e33db4f..853c4a7b6c9 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2293.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2293.json
@@ -61,9 +61,6 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java": [
 43
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java": [
-92
-],
 "eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java": [
 61,
 64,
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2325.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2325.json
index 8edb8ac14dd..aef1d4add7b 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2325.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2325.json
@@ -6,9 +6,6 @@
 513,
 559
 ],
-"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java": [
-1064
-],
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java": [
 46
 ],
@@ -28,7 +25,6 @@
 574
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java": [
-351,
 461
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java": [
@@ -46,22 +42,15 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java": [
 219
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java": [
-234
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java": [
 305
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java": [
-111,
 131
 ],
 "eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerConfiguration.java": [
 220
 ],
-"eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StdErrAppender.java": [
-188
-],
 "eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/AsyncJSON.java": [
 1105
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2387.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2387.json
new file mode 100644
index 00000000000..74ec0b0c184
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2387.json
@@ -0,0 +1,57 @@
+{
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java": [
+34
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java": [
+47
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java": [
+32
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSocketChannelEndPoint.java": [
+35
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java": [
+44
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
+83
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java": [
+51
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java": [
+55
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java": [
+53
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java": [
+74
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java": [
+156
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java": [
+37
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/StopLifeCycle.java": [
+29
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java": [
+38
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java": [
+39
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+118,
+141
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java": [
+48
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java": [
+60
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2694.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2694.json
index 3c9682178eb..d015d15460d 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2694.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2694.json
@@ -1,7 +1,4 @@
 {
-"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java": [
-209
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java": [
 532
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2698.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2698.json
index fe5630ee3aa..29a591ff594 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2698.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2698.json
@@ -1741,6 +1741,33 @@
 567,
 569
 ],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java": [
+292,
+293,
+321,
+322,
+328,
+329,
+352,
+353,
+359,
+383,
+384,
+390,
+391,
+397,
+398,
+403,
+428,
+430,
+450,
+468,
+472,
+492,
+499,
+513,
+565
+],
 "eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/SslEngineBehaviorTest.java": [
 77,
 83,
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2699.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2699.json
index 8e60296230f..87558e06fb8 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2699.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2699.json
@@ -18,9 +18,6 @@
 105,
 158
 ],
-"eclipse-jetty:jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/JettyLoggerTest.java": [
-221
-],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/SearchPatternTest.java": [
 224
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2925.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2925.json
index a33638d6511..830ed979429 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2925.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2925.json
@@ -51,6 +51,9 @@
 410,
 439
 ],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java": [
+561
+],
 "eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java": [
 384
 ],
@@ -106,6 +109,10 @@
 118,
 127
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/DelayedServerTest.java": [
+80,
+100
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java": [
 140,
 160,
@@ -126,6 +133,9 @@
 260,
 343
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java": [
+978
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java": [
 485,
 487,
@@ -232,6 +242,9 @@
 221,
 308
 ],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java": [
+589
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java": [
 250,
 315
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2972.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2972.json
index 19aa9f73d62..c0146df5a66 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2972.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S2972.json
@@ -81,11 +81,6 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
 527
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/DebugListener.java": [
-198,
-239,
-293
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
 143
 ],
@@ -162,9 +157,6 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/MovedContextHandler.java": [
 101
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java": [
-72
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java": [
 329,
 403
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3032.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3032.json
index 80eadccb129..d6743e24c8e 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3032.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3032.json
@@ -37,10 +37,6 @@
 559,
 637
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java": [
-48,
-49
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java": [
 243
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3038.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3038.json
index db94a6e5b61..2447586aa65 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3038.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3038.json
@@ -1,8 +1,8 @@
 {
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java": [
-62
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java": [
 115
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java": [
+310
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3077.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3077.json
index b4c7427eff9..1430beefbda 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3077.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3077.json
@@ -30,9 +30,6 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java": [
 36
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java": [
-51
-],
 "eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/Timestamp.java": [
 43
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3242.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3242.json
index 4bc82ccd16b..cb88ad4c763 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3242.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3242.json
@@ -6,7 +6,8 @@
 565
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java": [
-73
+73,
+130
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/FutureCallback.java": [
 176
@@ -17,6 +18,9 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/IntrospectionUtil.java": [
 215
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/LazyList.java": [
+147
+],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java": [
 211,
 271
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3252.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3252.json
index 71e09650c3d..cb9eaf2a65b 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3252.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3252.json
@@ -1,7 +1,4 @@
 {
-"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java": [
-1311
-],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java": [
 56
 ],
@@ -11,14 +8,18 @@
 599,
 601
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java": [
-122,
-415,
-417,
-451,
-453,
-467,
-468
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java": [
+45
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Request.java": [
+296
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java": [
+151,
+167
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
+78
 ],
 "eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerConfiguration.java": [
 125,
@@ -26,5 +27,8 @@
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java": [
 73
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java": [
+81
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3398.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3398.json
index 97db50a4134..1a471d4587c 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3398.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3398.json
@@ -1,26 +1,12 @@
 {
-"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
-309
-],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
-279,
-284,
-289,
-295,
-322,
-420,
-438
+300,
+316
 ],
 "eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java": [
 252
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java": [
-286
-],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java": [
-234
-],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java": [
-122
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java": [
+296
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3878.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3878.json
index 68f90a4c621..36ba068a9f7 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3878.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S3878.json
@@ -2,10 +2,54 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnectionFactory.java": [
 47
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
+432,
+460
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java": [
 77
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java": [
-47
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java": [
+445,
+457,
+469,
+481,
+493,
+505
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java": [
+61
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
+1235
+],
+"eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java": [
+141
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java": [
+109
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java": [
+204
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java": [
+81,
+118,
+176,
+225,
+298,
+440
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+514,
+542,
+562,
+592,
+1272,
+1306
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
+1656,
+1697
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4144.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4144.json
index e2821e99b11..c4d3abdd1b6 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4144.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4144.json
@@ -8,9 +8,6 @@
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java": [
 296
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java": [
-71
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java": [
 135
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4174.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4174.json
index b729f364a49..93aaf77418d 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4174.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4174.json
@@ -2,9 +2,6 @@
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/MappedResource.java": [
 90
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MemoryUtils.java": [
-33
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java": [
 678
 ],
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4830.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4830.json
new file mode 100644
index 00000000000..75f824f8831
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4830.json
@@ -0,0 +1,10 @@
+{
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+2326,
+2333,
+2340,
+2347,
+2354,
+2361
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4973.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4973.json
index fa9abcc9143..03df83a5075 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4973.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S4973.json
@@ -2,11 +2,6 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java": [
 103
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java": [
-143,
-181,
-195
-],
 "eclipse-jetty:tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsContainsHeaderValue.java": [
 63
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5669.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5669.json
new file mode 100644
index 00000000000..badace86ff0
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5669.json
@@ -0,0 +1,5 @@
+{
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java": [
+524
+]
+}
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5778.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5778.json
index d67a8d03e4a..5f2d91be0b1 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5778.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5778.json
@@ -44,8 +44,7 @@
 531
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/Utf8AppendableTest.java": [
-78,
-286
+78
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java": [
 218,
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5785.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5785.json
index ab24e763083..63b8dded0a6 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5785.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S5785.json
@@ -10,10 +10,8 @@
 422,
 477
 ],
-"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/ArrayUtilTest.java": [
-49,
-78,
-100
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java": [
+213
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java": [
 297,
@@ -70,16 +68,8 @@
 111
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/security/CredentialTest.java": [
-44,
-45,
-46,
-47,
-48,
 49,
 50,
-60,
-61,
-62,
 71
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S6212.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S6212.json
index 8f567ec3f26..92b57d1b03b 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S6212.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S6212.json
@@ -22,8 +22,7 @@
 ],
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java": [
 150,
-158,
-164
+158
 ],
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java": [
 241,
@@ -209,11 +208,6 @@
 176
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java": [
-69,
-126,
-190,
-286,
-300,
 411,
 436,
 489
@@ -246,22 +240,11 @@
 325
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java": [
-93,
 97,
-133,
 135,
-155,
-211,
 221,
-224,
 232
 ],
-"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java": [
-102,
-123,
-137,
-150
-],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
 97,
 98,
@@ -283,10 +266,6 @@
 1067
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/MappedByteBufferPool.java": [
-116,
-144,
-167,
-177,
 226
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java": [
@@ -296,25 +275,17 @@
 57
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java": [
-214,
 237
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java": [
-136,
-137,
 189
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java": [
-234,
 283,
-314,
-364,
 373,
 418,
 431,
-441,
-484,
-577
+441
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslClientConnectionFactory.java": [
 106,
@@ -324,8 +295,6 @@
 158
 ],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
-309,
-312,
 409,
 549,
 617,
@@ -352,15 +321,13 @@
 245
 ],
 "eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java": [
-183,
 201,
 226,
 245,
 249,
 351,
 360,
-379,
-416
+379
 ],
 "eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java": [
 205,
@@ -391,12 +358,8 @@
 346,
 354,
 356,
-379,
-398,
 542,
-700,
-752,
-782
+700
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java": [
 98,
@@ -457,11 +420,9 @@
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
 83,
-86,
 112,
 168,
 237,
-240,
 248
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java": [
@@ -504,8 +465,7 @@
 398,
 399,
 462,
-472,
-872
+472
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java": [
 101,
@@ -547,19 +507,13 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
 173,
 205,
-255,
 279,
 340,
 398,
-575,
-590,
 623,
 838,
 949,
 1041,
-1111,
-1126,
-1141,
 1345,
 1359,
 1726
@@ -649,17 +603,12 @@
 642,
 647
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyCustomizer.java": [
-58,
-61
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java": [
 170,
 191
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Request.java": [
 258,
-357,
 367,
 534,
 553,
@@ -692,7 +641,6 @@
 2238,
 2241,
 2243,
-2277,
 2283
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceContentFactory.java": [
@@ -721,13 +669,9 @@
 845
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Response.java": [
-216,
-244,
 275,
 319,
 320,
-734,
-810,
 822,
 1154,
 1158,
@@ -826,13 +770,9 @@
 546,
 549,
 550,
-744,
-786,
-805,
 950,
 987,
 988,
-1051,
 1124,
 1179,
 1224,
@@ -841,7 +781,6 @@
 1311,
 1324,
 1343,
-1419,
 1481,
 1491,
 1816,
@@ -862,7 +801,6 @@
 3011
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java": [
-85,
 105,
 117,
 118,
@@ -895,13 +833,8 @@
 501
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java": [
-75,
-137,
-178,
 179,
-193,
 194,
-204,
 207
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerList.java": [
@@ -915,7 +848,6 @@
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java": [
 59,
-72,
 99,
 109,
 119
@@ -932,8 +864,7 @@
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java": [
 86,
-89,
-100
+89
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/SecuredRedirectHandler.java": [
 44,
@@ -947,14 +878,10 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java": [
 95,
 97,
-109,
 143,
 154,
-196,
 208,
-572,
-613,
-622
+572
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java": [
 179,
@@ -978,12 +905,6 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/AbstractHandlerMBean.java": [
 58
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java": [
-43,
-55,
-62,
-69
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/jmx/AbstractConnectorMBean.java": [
 40
 ],
@@ -993,7 +914,6 @@
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java": [
 347,
-369,
 647,
 756,
 835
@@ -1007,9 +927,6 @@
 283
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCache.java": [
-96,
-104,
-125,
 139,
 180,
 187
@@ -1087,7 +1004,6 @@
 143,
 144,
 147,
-151,
 506
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
@@ -1130,7 +1046,6 @@
 ],
 "eclipse-jetty:jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java": [
 43,
-122,
 165,
 170
 ],
@@ -1182,9 +1097,7 @@
 1139,
 1232,
 1274,
-1330,
-1372,
-1382
+1330
 ],
 "eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java": [
 134,
@@ -1195,7 +1108,6 @@
 396,
 506,
 517,
-583,
 629,
 633,
 760,
@@ -1302,7 +1214,6 @@
 184
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java": [
-77,
 93,
 96,
 99,
@@ -1318,12 +1229,10 @@
 238
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java": [
-92,
 138
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java": [
-145,
-170
+145
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/FutureCallback.java": [
 158
@@ -1435,7 +1344,6 @@
 934,
 990,
 1110,
-1172,
 1184,
 1198,
 1199,
@@ -1451,8 +1359,6 @@
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java": [
 167,
-186,
-213,
 237,
 460,
 462,
@@ -1507,11 +1413,7 @@
 212,
 213,
 364,
-386,
-729,
-745,
-756,
-783
+386
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/SearchPattern.java": [
 78,
@@ -1696,8 +1598,7 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java": [
 198,
 346,
-657,
-881
+657
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java": [
 62,
@@ -1711,12 +1612,8 @@
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java": [
 127,
-160,
 169
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java": [
-120
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java": [
 45
 ],
@@ -1727,14 +1624,11 @@
 47
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java": [
-144,
 168,
 193,
 207,
 308,
-328,
 338,
-390,
 396
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java": [
@@ -1934,7 +1828,6 @@
 265,
 281,
 316,
-331,
 363
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java": [
@@ -1964,9 +1857,6 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java": [
 46
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java": [
-170
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPoolBudget.java": [
 115,
 169
@@ -1993,7 +1883,6 @@
 174,
 178,
 184,
-211,
 366,
 377,
 378,
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S8786.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S8786.json
index 7341be74edf..d10709da982 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S8786.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S8786.json
@@ -2,6 +2,9 @@
 "eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java": [
 137
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java": [
+472
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java": [
 366
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9357.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9357.json
index ce56e185983..931baec3197 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9357.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9357.json
@@ -8,28 +8,9 @@
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
 297
 ],
-"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java": [
-150,
-203,
-238,
-264,
-295,
-331,
-526,
-562,
-707,
-764,
-1600,
-1702,
-1748,
-1998
-],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java": [
 285
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MemoryUtils.java": [
-37
-],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java": [
 219,
 293,
@@ -49,10 +30,6 @@
 188,
 202
 ],
-"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/SweeperTest.java": [
-77,
-113
-],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/ExecutionStrategyTest.java": [
 188
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9391.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9391.json
index 17c87b6b4ea..b8d151665f8 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9391.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9391.json
@@ -9,10 +9,6 @@
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
 723
 ],
-"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java": [
-300,
-433
-],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java": [
 344
 ],
@@ -28,9 +24,6 @@
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java": [
 835
 ],
-"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java": [
-406
-],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java": [
 67,
 176
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9395.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9395.json
index d8595eab348..7bec7add340 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9395.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9395.json
@@ -1,10 +1,16 @@
 {
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java": [
+1166
+],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java": [
 362,
 646,
 763,
 768
 ],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/statistic/SampleStatistic.java": [
+113
+],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java": [
 201
 ]
diff --git a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9396.json b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9396.json
index 80ec0b00fb8..aebc3e903b7 100644
--- a/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9396.json
+++ b/its/ruling/src/test/resources/expected/eclipse-jetty/java-S9396.json
@@ -1,26 +1,398 @@
 {
+"eclipse-jetty:jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java": [
+1339,
+1340
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/CookieCutterLenientTest.java": [
+183,
+184
+],
+"eclipse-jetty:jetty-http/src/test/java/org/eclipse/jetty/http/CookieCutterTest.java": [
+295
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java": [
+194,
+195,
+196
+],
 "eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java": [
-703
+496,
+497,
+703,
+748,
+749,
+816,
+817,
+818,
+885,
+886,
+887,
+888,
+945,
+946,
+996,
+1018,
+1019,
+1053,
+1054
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java": [
+58
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java": [
+211,
+212
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslClientConnectionFactory.java": [
+144
+],
+"eclipse-jetty:jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java": [
+129,
+461,
+462
+],
+"eclipse-jetty:jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java": [
+191
+],
+"eclipse-jetty:jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java": [
+222,
+223
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
+689,
 690
 ],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java": [
+384,
+385,
+386,
+387,
+388,
+389,
+390,
+391,
+392,
+393,
+394,
+395,
+396,
+397,
+398,
+680,
+681,
+682
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
+145,
+146
+],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java": [
-369
+246,
+247,
+248,
+249,
+250,
+251,
+365,
+366,
+367,
+368,
+369,
+370
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java": [
+571,
+572,
+574,
+575,
+576,
+577,
+578
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java": [
+1217,
+1218,
+1219,
+1220
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java": [
+711,
+712,
+713,
+714,
+715,
+716,
+717,
+718
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
-1566
+1496,
+1524,
+1566,
+1596,
+1597,
+1598,
+1599,
+1693,
+1694,
+1695,
+1696,
+1769,
+1770,
+1771,
+1772
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java": [
+237,
+238
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java": [
+413,
+447,
+495,
+496,
+534,
+535
 ],
 "eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
-116
+111,
+112,
+113,
+114,
+115,
+116,
+117,
+118,
+119,
+663,
+664,
+665,
+666
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
+438,
+439,
+440,
+441,
+442,
+443,
+444
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java": [
+319,
+320,
+322,
+323,
+324,
+325,
+326
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java": [
+321
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java": [
+177,
+178,
+179,
+180,
+181
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
+2084,
+2085
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java": [
+267,
+268,
+269
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java": [
+54,
+55
+],
+"eclipse-jetty:jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java": [
+112
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java": [
+109,
+110
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java": [
+183,
+185,
+186,
+187
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java": [
+784
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpInputTest.java": [
+69,
+123
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java": [
+118,
+119,
+192,
+193,
+265,
+266,
+346,
+347,
+429,
+430,
+512,
+513,
+599,
+600,
+681,
+682,
+764,
+765,
+842,
+843,
+922,
+923
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java": [
+520
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java": [
+1865
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java": [
+262,
+263,
+264,
+265,
+266,
+267,
+268
 ],
 "eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java": [
-2142
+1970,
+1971,
+1972,
+2025,
+2027,
+2048,
+2049,
+2106,
+2142,
+2143,
+2144
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java": [
+1463
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java": [
+244,
+245
+],
+"eclipse-jetty:jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java": [
+145,
+183
+],
+"eclipse-jetty:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java": [
+1258,
+1259
 ],
 "eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/BlockingArrayQueue.java": [
-840
+840,
+841
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java": [
+174,
+175,
+176
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java": [
+156,
+157,
+158,
+159,
+160
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java": [
+534,
+535,
+536,
+537,
+538,
+539
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java": [
+377,
+382
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java": [
+160,
+161,
+162
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java": [
+100
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java": [
+2037
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java": [
+268,
+269
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java": [
+95,
+96
+],
+"eclipse-jetty:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPoolBudget.java": [
+49,
+50
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/TestIntrospectionUtil.java": [
+55,
+56,
+57,
+58,
+63,
+64,
+65,
+66
 ],
 "eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java": [
+161,
+162,
+163,
+164,
+165,
+167,
+168,
+169,
+170,
+172
+],
+"eclipse-jetty:jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java": [
+106,
+107,
+108,
+109,
+110,
 172
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
+1464,
+1465,
+1466,
+1467,
+1592,
+1593,
+1594
+],
+"eclipse-jetty:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java": [
+304,
+305,
+330,
+331,
+332,
+333
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S107.json b/its/ruling/src/test/resources/expected/guava/java-S107.json
index 74f9f1a1738..1968c293527 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S107.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S107.json
@@ -41,7 +41,8 @@
 110
 ],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
-3917
+3917,
+3990
 ],
 "guava:src/com/google/common/primitives/Longs.java": [
 305
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1128.json b/its/ruling/src/test/resources/expected/guava/java-S1128.json
index dce09dde4a7..90577471555 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1128.json
@@ -1,20 +1,40 @@
 {
+"guava:src/com/google/common/cache/CacheLoader.java": [
+31
+],
 "guava:src/com/google/common/cache/LocalCache.java": [
-67
+31
 ],
-"guava:src/com/google/common/collect/ArrayTable.java": [
-36
+"guava:src/com/google/common/collect/StandardTable.java": [
+28
 ],
-"guava:src/com/google/common/collect/DenseImmutableTable.java": [
+"guava:src/com/google/common/collect/TreeBasedTable.java": [
 24
 ],
-"guava:src/com/google/common/collect/ImmutableMultiset.java": [
-23
+"guava:src/com/google/common/net/MediaType.java": [
+30
+],
+"guava:src/com/google/common/reflect/MutableTypeToInstanceMap.java": [
+22
 ],
-"guava:src/com/google/common/collect/RegularImmutableTable.java": [
+"guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
 20
 ],
 "guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
-26
+26,
+30
+],
+"guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
+24,
+32
+],
+"guava:src/com/google/common/util/concurrent/AtomicLongMap.java": [
+22
+],
+"guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
+22
+],
+"guava:src/com/google/common/util/concurrent/ServiceManager.java": [
+35
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1130.json b/its/ruling/src/test/resources/expected/guava/java-S1130.json
index 3c43b763676..8b3ee934e92 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1130.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1130.json
@@ -1,8 +1,116 @@
 {
+"guava:src/com/google/common/base/Joiner.java": [
+107,
+365
+],
+"guava:src/com/google/common/cache/LocalCache.java": [
+2345
+],
+"guava:src/com/google/common/collect/MapMakerInternalMap.java": [
+3949,
+3971,
+3971
+],
+"guava:src/com/google/common/collect/Queues.java": [
+261
+],
+"guava:src/com/google/common/collect/Serialization.java": [
+46,
+59,
+83,
+83,
+102,
+129,
+129,
+149,
+178,
+178
+],
+"guava:src/com/google/common/hash/BloomFilter.java": [
+487
+],
+"guava:src/com/google/common/io/BaseEncoding.java": [
+620
+],
+"guava:src/com/google/common/io/ByteSource.java": [
+236,
+492
+],
+"guava:src/com/google/common/io/ByteStreams.java": [
+93,
+119,
+734,
+771
+],
+"guava:src/com/google/common/io/CharSource.java": [
+154
+],
+"guava:src/com/google/common/io/CharStreams.java": [
+63,
+116,
+137
+],
+"guava:src/com/google/common/io/Closer.java": [
+145,
+167,
+191
+],
+"guava:src/com/google/common/io/FileBackedOutputStream.java": [
+131,
+194
+],
 "guava:src/com/google/common/io/Files.java": [
-678
+83,
+100,
+172,
+259,
+273,
+284,
+295,
+312,
+329,
+360,
+375,
+384,
+522,
+573,
+589,
+603,
+678,
+695
+],
+"guava:src/com/google/common/io/LineReader.java": [
+71
 ],
 "guava:src/com/google/common/io/LittleEndianDataInputStream.java": [
 222
+],
+"guava:src/com/google/common/io/Resources.java": [
+98,
+112,
+128,
+174
+],
+"guava:src/com/google/common/net/InetAddresses.java": [
+961
+],
+"guava:src/com/google/common/reflect/ClassPath.java": [
+411
+],
+"guava:src/com/google/common/util/concurrent/Monitor.java": [
+378,
+417,
+636,
+684,
+1079,
+1113
+],
+"guava:src/com/google/common/util/concurrent/MoreExecutors.java": [
+678
+],
+"guava:src/com/google/common/util/concurrent/Uninterruptibles.java": [
+138,
+171,
+171
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1144.json b/its/ruling/src/test/resources/expected/guava/java-S1144.json
new file mode 100644
index 00000000000..dd136b3e482
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S1144.json
@@ -0,0 +1,166 @@
+{
+"guava:src/com/google/common/base/CaseFormat.java": [
+125
+],
+"guava:src/com/google/common/base/Converter.java": [
+413
+],
+"guava:src/com/google/common/base/Functions.java": [
+267,
+358
+],
+"guava:src/com/google/common/base/Predicates.java": [
+366,
+408,
+450,
+557,
+599
+],
+"guava:src/com/google/common/base/StandardSystemProperty.java": [
+122
+],
+"guava:src/com/google/common/cache/LocalCache.java": [
+4736
+],
+"guava:src/com/google/common/collect/AbstractBiMap.java": [
+395
+],
+"guava:src/com/google/common/collect/ArrayListMultimap.java": [
+115
+],
+"guava:src/com/google/common/collect/ArrayTable.java": [
+167,
+172
+],
+"guava:src/com/google/common/collect/BinaryTreeTraverser.java": [
+207
+],
+"guava:src/com/google/common/collect/CartesianList.java": [
+67
+],
+"guava:src/com/google/common/collect/Constraints.java": [
+281,
+332
+],
+"guava:src/com/google/common/collect/EnumBiMap.java": [
+76
+],
+"guava:src/com/google/common/collect/EnumHashBiMap.java": [
+75
+],
+"guava:src/com/google/common/collect/EnumMultiset.java": [
+78
+],
+"guava:src/com/google/common/collect/EvictingQueue.java": [
+52
+],
+"guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
+71
+],
+"guava:src/com/google/common/collect/HashBiMap.java": [
+116
+],
+"guava:src/com/google/common/collect/HashMultimap.java": [
+91,
+97
+],
+"guava:src/com/google/common/collect/HashMultiset.java": [
+74
+],
+"guava:src/com/google/common/collect/ImmutableEnumMap.java": [
+51
+],
+"guava:src/com/google/common/collect/ImmutableSortedMap.java": [
+105
+],
+"guava:src/com/google/common/collect/Iterables.java": [
+87,
+506
+],
+"guava:src/com/google/common/collect/LinkedHashMultimap.java": [
+144,
+148
+],
+"guava:src/com/google/common/collect/LinkedHashMultiset.java": [
+86
+],
+"guava:src/com/google/common/collect/LinkedListMultimap.java": [
+204,
+208,
+310
+],
+"guava:src/com/google/common/collect/MapConstraints.java": [
+190,
+216,
+250,
+268,
+770,
+780
+],
+"guava:src/com/google/common/collect/Maps.java": [
+455,
+550,
+3114
+],
+"guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
+241
+],
+"guava:src/com/google/common/collect/Multimaps.java": [
+826,
+847,
+2051
+],
+"guava:src/com/google/common/collect/MutableClassToInstanceMap.java": [
+59
+],
+"guava:src/com/google/common/collect/Serialization.java": [
+207
+],
+"guava:src/com/google/common/collect/Sets.java": [
+1191
+],
+"guava:src/com/google/common/collect/StandardRowSortedTable.java": [
+63
+],
+"guava:src/com/google/common/collect/Synchronized.java": [
+830,
+1113
+],
+"guava:src/com/google/common/collect/TreeRangeMap.java": [
+532
+],
+"guava:src/com/google/common/collect/TreeRangeSet.java": [
+66,
+272
+],
+"guava:src/com/google/common/collect/WellBehavedMap.java": [
+42
+],
+"guava:src/com/google/common/eventbus/SubscriberRegistry.java": [
+184
+],
+"guava:src/com/google/common/hash/BloomFilter.java": [
+112
+],
+"guava:src/com/google/common/hash/Hashing.java": [
+316
+],
+"guava:src/com/google/common/io/FileBackedOutputStream.java": [
+131
+],
+"guava:src/com/google/common/net/MediaType.java": [
+754
+],
+"guava:src/com/google/common/reflect/TypeResolver.java": [
+205
+],
+"guava:src/com/google/common/util/concurrent/AtomicLongMap.java": [
+58
+],
+"guava:src/com/google/common/util/concurrent/Striped.java": [
+316
+],
+"guava:src/com/google/thirdparty/publicsuffix/PublicSuffixType.java": [
+38
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1161.json b/its/ruling/src/test/resources/expected/guava/java-S1161.json
index e2edab58462..565c9301517 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1161.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1161.json
@@ -1,4 +1,7 @@
 {
+"guava:src/com/google/common/cache/LongAdder.java": [
+56
+],
 "guava:src/com/google/common/collect/EmptyContiguousSet.java": [
 167
 ],
@@ -6,6 +9,9 @@
 358,
 406
 ],
+"guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
+395
+],
 "guava:src/com/google/common/reflect/Parameter.java": [
 89,
 106,
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1162.json b/its/ruling/src/test/resources/expected/guava/java-S1162.json
index a3977494918..9e9c7a99e85 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1162.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1162.json
@@ -87,12 +87,6 @@
 "guava:src/com/google/common/util/concurrent/Futures.java": [
 1339
 ],
-"guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
-59,
-77,
-79,
-207
-],
 "guava:src/com/google/common/util/concurrent/Monitor.java": [
 503,
 774
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1181.json b/its/ruling/src/test/resources/expected/guava/java-S1181.json
index 62ebc53d434..838d317bebe 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1181.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1181.json
@@ -67,9 +67,6 @@
 175,
 213
 ],
-"guava:src/com/google/common/util/concurrent/AggregateFuture.java": [
-227
-],
 "guava:src/com/google/common/util/concurrent/Futures.java": [
 776,
 787,
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1226.json b/its/ruling/src/test/resources/expected/guava/java-S1226.json
new file mode 100644
index 00000000000..4af03e18693
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S1226.json
@@ -0,0 +1,239 @@
+{
+"guava:src/com/google/common/base/Ascii.java": [
+604
+],
+"guava:src/com/google/common/base/CharMatcher.java": [
+909,
+913,
+947,
+1005
+],
+"guava:src/com/google/common/base/Preconditions.java": [
+410
+],
+"guava:src/com/google/common/base/Throwables.java": [
+175,
+202
+],
+"guava:src/com/google/common/base/internal/Finalizer.java": [
+173
+],
+"guava:src/com/google/common/cache/LocalCache.java": [
+1796,
+1797,
+1798,
+1799,
+1800
+],
+"guava:src/com/google/common/cache/Striped64.java": [
+196,
+230
+],
+"guava:src/com/google/common/collect/Hashing.java": [
+59
+],
+"guava:src/com/google/common/collect/ImmutableCollection.java": [
+181
+],
+"guava:src/com/google/common/collect/ImmutableEnumMap.java": [
+82
+],
+"guava:src/com/google/common/collect/ImmutableEnumSet.java": [
+83,
+99
+],
+"guava:src/com/google/common/collect/ImmutableList.java": [
+312
+],
+"guava:src/com/google/common/collect/ImmutableMultimap.java": [
+692
+],
+"guava:src/com/google/common/collect/ImmutableMultiset.java": [
+286
+],
+"guava:src/com/google/common/collect/ImmutableSortedMultiset.java": [
+232
+],
+"guava:src/com/google/common/collect/MapMakerInternalMap.java": [
+1815,
+1816,
+1817,
+1818,
+1819
+],
+"guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
+558,
+576,
+715
+],
+"guava:src/com/google/common/collect/ObjectArrays.java": [
+145,
+168
+],
+"guava:src/com/google/common/collect/RegularImmutableBiMap.java": [
+123
+],
+"guava:src/com/google/common/collect/RegularImmutableMap.java": [
+98
+],
+"guava:src/com/google/common/collect/RegularImmutableSortedSet.java": [
+85
+],
+"guava:src/com/google/common/collect/Sets.java": [
+1581
+],
+"guava:src/com/google/common/collect/SortedLists.java": [
+262
+],
+"guava:src/com/google/common/collect/TreeRangeSet.java": [
+442
+],
+"guava:src/com/google/common/escape/ArrayBasedCharEscaper.java": [
+104,
+105
+],
+"guava:src/com/google/common/escape/ArrayBasedUnicodeEscaper.java": [
+113,
+114
+],
+"guava:src/com/google/common/escape/UnicodeEscaper.java": [
+216
+],
+"guava:src/com/google/common/hash/BloomFilter.java": [
+342,
+451
+],
+"guava:src/com/google/common/hash/HashCode.java": [
+95
+],
+"guava:src/com/google/common/hash/Murmur3_128HashFunction.java": [
+185,
+186,
+187,
+188,
+189,
+194,
+195,
+196,
+201,
+202,
+203
+],
+"guava:src/com/google/common/hash/Murmur3_32HashFunction.java": [
+131,
+132,
+133,
+138,
+139,
+140,
+146,
+147,
+148,
+149,
+150,
+151
+],
+"guava:src/com/google/common/io/BaseEncoding.java": [
+224,
+653,
+870
+],
+"guava:src/com/google/common/io/ByteSource.java": [
+670
+],
+"guava:src/com/google/common/io/ByteStreams.java": [
+628,
+649,
+719
+],
+"guava:src/com/google/common/io/CharSource.java": [
+543
+],
+"guava:src/com/google/common/io/CharStreams.java": [
+169
+],
+"guava:src/com/google/common/math/BigIntegerMath.java": [
+405
+],
+"guava:src/com/google/common/math/DoubleMath.java": [
+182
+],
+"guava:src/com/google/common/math/IntMath.java": [
+209,
+217,
+384,
+386,
+400,
+403,
+404,
+479,
+482,
+529
+],
+"guava:src/com/google/common/math/LongMath.java": [
+254,
+262,
+478,
+480,
+494,
+497,
+498,
+595,
+598,
+654,
+717,
+718,
+823,
+906,
+910,
+921
+],
+"guava:src/com/google/common/net/InetAddresses.java": [
+192
+],
+"guava:src/com/google/common/net/InternetDomainName.java": [
+143,
+146
+],
+"guava:src/com/google/common/net/PercentEscaper.java": [
+105,
+197,
+199,
+201,
+213,
+215,
+217,
+219,
+232,
+234,
+236,
+238,
+240,
+242
+],
+"guava:src/com/google/common/primitives/Longs.java": [
+274
+],
+"guava:src/com/google/common/primitives/UnsignedLongs.java": [
+384,
+389
+],
+"guava:src/com/google/common/reflect/AbstractInvocationHandler.java": [
+66
+],
+"guava:src/com/google/common/util/concurrent/AggregateFuture.java": [
+280
+],
+"guava:src/com/google/common/util/concurrent/Monitor.java": [
+1127
+],
+"guava:src/com/google/common/util/concurrent/MoreExecutors.java": [
+717
+],
+"guava:src/com/google/common/util/concurrent/SmoothRateLimiter.java": [
+247
+],
+"guava:src/com/google/common/util/concurrent/Striped.java": [
+459
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1604.json b/its/ruling/src/test/resources/expected/guava/java-S1604.json
index 439651b9df6..385d3a590cd 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1604.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1604.json
@@ -5,123 +5,37 @@
 "guava:src/com/google/common/base/Optional.java": [
 297
 ],
-"guava:src/com/google/common/base/Splitter.java": [
-148,
-179,
-230,
-294
-],
-"guava:src/com/google/common/cache/CacheBuilder.java": [
-183
-],
 "guava:src/com/google/common/cache/LocalCache.java": [
-2327,
-3547
-],
-"guava:src/com/google/common/cache/LongAddables.java": [
-38,
-45
+2327
 ],
 "guava:src/com/google/common/cache/RemovalListeners.java": [
-45,
 48
 ],
-"guava:src/com/google/common/collect/Collections2.java": [
-302
-],
-"guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
-398
-],
-"guava:src/com/google/common/collect/Interners.java": [
-46
-],
-"guava:src/com/google/common/collect/Iterables.java": [
-1014
-],
 "guava:src/com/google/common/collect/Iterators.java": [
 1296
 ],
-"guava:src/com/google/common/collect/MapConstraints.java": [
-227,
-485
-],
 "guava:src/com/google/common/collect/Maps.java": [
-1863,
-1874,
-1888,
-1922,
-3098
-],
-"guava:src/com/google/common/collect/Multimaps.java": [
-519,
-1202,
-1702
-],
-"guava:src/com/google/common/collect/Multisets.java": [
-305
-],
-"guava:src/com/google/common/collect/MutableClassToInstanceMap.java": [
-64
-],
-"guava:src/com/google/common/collect/Range.java": [
-117,
-129
+1863
 ],
 "guava:src/com/google/common/collect/RegularImmutableTable.java": [
 114
 ],
-"guava:src/com/google/common/collect/StandardTable.java": [
-721,
-794
-],
-"guava:src/com/google/common/collect/Tables.java": [
-240,
-390,
-419,
-429,
-592
-],
-"guava:src/com/google/common/collect/TreeBasedTable.java": [
-321
-],
-"guava:src/com/google/common/escape/Escaper.java": [
-90
-],
 "guava:src/com/google/common/eventbus/Subscriber.java": [
 76
 ],
 "guava:src/com/google/common/io/CharSource.java": [
 442
 ],
-"guava:src/com/google/common/net/MediaType.java": [
-406,
-744
-],
-"guava:src/com/google/common/reflect/ClassPath.java": [
-64
-],
-"guava:src/com/google/common/reflect/MutableTypeToInstanceMap.java": [
-124
-],
-"guava:src/com/google/common/reflect/TypeToken.java": [
-701
-],
-"guava:src/com/google/common/reflect/Types.java": [
-61
-],
 "guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
-45,
 50,
 145
 ],
 "guava:src/com/google/common/util/concurrent/AbstractIdleService.java": [
-40,
 50,
 64,
 95
 ],
 "guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
-205,
 210,
 232,
 304
@@ -129,23 +43,16 @@
 "guava:src/com/google/common/util/concurrent/AggregateFuture.java": [
 138
 ],
-"guava:src/com/google/common/util/concurrent/AtomicLongMap.java": [
-294
-],
 "guava:src/com/google/common/util/concurrent/Callables.java": [
 44,
 94
 ],
 "guava:src/com/google/common/util/concurrent/Futures.java": [
 1168,
-1494,
 1569,
 1662,
 1749
 ],
-"guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
-253
-],
 "guava:src/com/google/common/util/concurrent/JdkFutureAdapters.java": [
 160
 ],
@@ -157,16 +64,6 @@
 "guava:src/com/google/common/util/concurrent/Runnables.java": [
 31
 ],
-"guava:src/com/google/common/util/concurrent/ServiceManager.java": [
-598
-],
-"guava:src/com/google/common/util/concurrent/Striped.java": [
-199,
-214,
-236,
-252,
-283
-],
 "guava:src/com/google/common/util/concurrent/ThreadFactoryBuilder.java": [
 161
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1698.json b/its/ruling/src/test/resources/expected/guava/java-S1698.json
index 398ed54b1d9..732744e6692 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1698.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1698.json
@@ -2,6 +2,9 @@
 "guava:src/com/google/common/collect/AbstractBiMap.java": [
 95
 ],
+"guava:src/com/google/common/collect/AbstractMapBasedMultimap.java": [
+379
+],
 "guava:src/com/google/common/collect/Cut.java": [
 73,
 76
@@ -21,15 +24,9 @@
 364,
 533
 ],
-"guava:src/com/google/common/collect/Range.java": [
-355,
-356,
-365,
-393
-],
-"guava:src/com/google/common/collect/TreeRangeSet.java": [
-506,
-559
+"guava:src/com/google/common/collect/TreeMultiset.java": [
+425,
+467
 ],
 "guava:src/com/google/common/io/Files.java": [
 387
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1699.json b/its/ruling/src/test/resources/expected/guava/java-S1699.json
index 721f8dc38ce..ae13c0a0290 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1699.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1699.json
@@ -39,6 +39,12 @@
 "guava:src/com/google/common/collect/TreeMultimap.java": [
 130
 ],
+"guava:src/com/google/common/reflect/TypeParameter.java": [
+47
+],
+"guava:src/com/google/common/reflect/TypeToken.java": [
+112
+],
 "guava:src/com/google/common/util/concurrent/CycleDetectingLockFactory.java": [
 529,
 534,
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1845.json b/its/ruling/src/test/resources/expected/guava/java-S1845.json
index 8b2d61ace5c..995d42da6ce 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1845.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1845.json
@@ -9,20 +9,61 @@
 ],
 "guava:src/com/google/common/cache/LocalCache.java": [
 732,
-4356
+4356,
+4588
+],
+"guava:src/com/google/common/collect/Constraints.java": [
+146,
+208
+],
+"guava:src/com/google/common/collect/MapConstraints.java": [
+408,
+410,
+412,
+431,
+432,
+521
 ],
 "guava:src/com/google/common/collect/MapMaker.java": [
+115,
+116,
 117,
 127,
 479
 ],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 615,
-3687
+3687,
+3915
+],
+"guava:src/com/google/common/collect/Maps.java": [
+1472,
+1474
+],
+"guava:src/com/google/common/collect/Multimaps.java": [
+496,
+497,
+498,
+499,
+500
+],
+"guava:src/com/google/common/collect/Multisets.java": [
+98,
+110,
+122
+],
+"guava:src/com/google/common/collect/SingletonImmutableBiMap.java": [
+82
 ],
 "guava:src/com/google/common/collect/StandardTable.java": [
 270
 ],
+"guava:src/com/google/common/collect/Tables.java": [
+460
+],
+"guava:src/com/google/common/collect/TreeRangeSet.java": [
+89
+],
 "guava:src/com/google/common/io/Closer.java": [
 107
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1939.json b/its/ruling/src/test/resources/expected/guava/java-S1939.json
index 805fac2b31d..6fa74d8a8a5 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1939.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1939.json
@@ -8,17 +8,6 @@
 "guava:src/com/google/common/collect/MapMaker.java": [
 869
 ],
-"guava:src/com/google/common/collect/MapMakerInternalMap.java": [
-1014,
-1061,
-1096,
-1268,
-1316,
-1352,
-1526,
-1574,
-1610
-],
 "guava:src/com/google/common/collect/Synchronized.java": [
 1109
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S1948.json b/its/ruling/src/test/resources/expected/guava/java-S1948.json
index 5d472ac5984..281f93d0a74 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S1948.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S1948.json
@@ -128,6 +128,9 @@
 "guava:src/com/google/common/collect/ImmutableEnumMap.java": [
 107
 ],
+"guava:src/com/google/common/collect/ImmutableEnumSet.java": [
+132
+],
 "guava:src/com/google/common/collect/ImmutableList.java": [
 588
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2109.json b/its/ruling/src/test/resources/expected/guava/java-S2109.json
new file mode 100644
index 00000000000..bd384843ca6
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S2109.json
@@ -0,0 +1,5 @@
+{
+"guava:src/com/google/common/eventbus/SubscriberRegistry.java": [
+189
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2118.json b/its/ruling/src/test/resources/expected/guava/java-S2118.json
index c456f8ac47e..c4e65dc0cf8 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2118.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2118.json
@@ -1,13 +1,44 @@
 {
+"guava:src/com/google/common/collect/ConcurrentHashMultiset.java": [
+591
+],
+"guava:src/com/google/common/collect/EnumBiMap.java": [
+138,
+139
+],
+"guava:src/com/google/common/collect/EnumHashBiMap.java": [
+111
+],
+"guava:src/com/google/common/collect/EnumMultiset.java": [
+86
+],
 "guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
 508
 ],
+"guava:src/com/google/common/collect/LinkedHashMultimap.java": [
+545,
+549,
+550
+],
+"guava:src/com/google/common/collect/LinkedListMultimap.java": [
+802,
+803
+],
+"guava:src/com/google/common/collect/MapMakerInternalMap.java": [
+3943
+],
 "guava:src/com/google/common/collect/Multimaps.java": [
 139,
 218,
 296,
 380
 ],
+"guava:src/com/google/common/collect/Serialization.java": [
+62,
+63,
+152,
+155
+],
 "guava:src/com/google/common/collect/TreeMultimap.java": [
 248,
 249
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2159.json b/its/ruling/src/test/resources/expected/guava/java-S2159.json
new file mode 100644
index 00000000000..894eb415c7d
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S2159.json
@@ -0,0 +1,10 @@
+{
+"guava:src/com/google/common/collect/SingletonImmutableBiMap.java": [
+52,
+61,
+65
+],
+"guava:src/com/google/common/collect/SingletonImmutableSet.java": [
+58
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2175.json b/its/ruling/src/test/resources/expected/guava/java-S2175.json
new file mode 100644
index 00000000000..12ba43d338a
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S2175.json
@@ -0,0 +1,76 @@
+{
+"guava:src/com/google/common/cache/AbstractCache.java": [
+69
+],
+"guava:src/com/google/common/collect/AbstractBiMap.java": [
+153,
+159
+],
+"guava:src/com/google/common/collect/AbstractMapBasedMultimap.java": [
+186,
+258,
+547,
+570,
+1304
+],
+"guava:src/com/google/common/collect/AbstractMapBasedMultiset.java": [
+243,
+255
+],
+"guava:src/com/google/common/collect/AbstractMultimap.java": [
+48,
+59,
+65
+],
+"guava:src/com/google/common/collect/AbstractTable.java": [
+60
+],
+"guava:src/com/google/common/collect/Collections2.java": [
+193
+],
+"guava:src/com/google/common/collect/ImmutableList.java": [
+354,
+530,
+536
+],
+"guava:src/com/google/common/collect/ImmutableMap.java": [
+441,
+546,
+551
+],
+"guava:src/com/google/common/collect/LinkedListMultimap.java": [
+459,
+473,
+572
+],
+"guava:src/com/google/common/collect/Maps.java": [
+1947,
+1953,
+1954,
+1962,
+1963,
+2652,
+2652,
+2656,
+2665,
+2738,
+2800,
+3016,
+3021,
+3031
+],
+"guava:src/com/google/common/collect/Multimaps.java": [
+945,
+950,
+1022,
+1025
+],
+"guava:src/com/google/common/collect/StandardTable.java": [
+155,
+157,
+711
+],
+"guava:src/com/google/common/collect/Synchronized.java": [
+1164
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2178.json b/its/ruling/src/test/resources/expected/guava/java-S2178.json
index 00f641e30b0..81485221236 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2178.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2178.json
@@ -18,8 +18,7 @@
 ],
 "guava:src/com/google/common/math/IntMath.java": [
 63,
-323,
-481
+323
 ],
 "guava:src/com/google/common/math/LongMath.java": [
 63,
@@ -57,7 +56,6 @@
 762,
 762,
 763,
-1382,
 1382
 ],
 "guava:src/com/google/common/util/concurrent/Monitor.java": [
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2184.json b/its/ruling/src/test/resources/expected/guava/java-S2184.json
new file mode 100644
index 00000000000..c2a929f1391
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S2184.json
@@ -0,0 +1,23 @@
+{
+"guava:src/com/google/common/collect/TreeMultiset.java": [
+183,
+205,
+833
+],
+"guava:src/com/google/common/io/MultiInputStream.java": [
+116
+],
+"guava:src/com/google/common/math/DoubleMath.java": [
+450
+],
+"guava:src/com/google/common/math/DoubleUtils.java": [
+99
+],
+"guava:src/com/google/common/util/concurrent/SmoothRateLimiter.java": [
+260,
+334,
+343,
+356,
+392
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2221.json b/its/ruling/src/test/resources/expected/guava/java-S2221.json
index 358ffadc453..ed192e0cc83 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2221.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2221.json
@@ -2,17 +2,16 @@
 "guava:src/com/google/common/base/FinalizableReferenceQueue.java": [
 301
 ],
-"guava:src/com/google/common/cache/Striped64.java": [
-112,
-304
+"guava:src/com/google/common/cache/LocalCache.java": [
+4048
 ],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 1954
 ],
-"guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
-897
-],
 "guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
 220
+],
+"guava:src/com/google/common/util/concurrent/WrappingExecutorService.java": [
+71
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2293.json b/its/ruling/src/test/resources/expected/guava/java-S2293.json
index bb908fc04cb..05a07beaf9a 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2293.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2293.json
@@ -13,7 +13,6 @@
 "guava:src/com/google/common/base/Enums.java": [
 84,
 91,
-93,
 120
 ],
 "guava:src/com/google/common/base/Equivalence.java": [
@@ -110,9 +109,7 @@
 2261,
 2436,
 2443,
-3163,
-4733,
-4829
+3163
 ],
 "guava:src/com/google/common/cache/Striped64.java": [
 125
@@ -134,7 +131,6 @@
 78,
 91,
 101,
-105,
 130
 ],
 "guava:src/com/google/common/collect/ArrayTable.java": [
@@ -163,13 +159,10 @@
 ],
 "guava:src/com/google/common/collect/ComputingConcurrentHashMap.java": [
 56,
-135,
-361,
-365
+135
 ],
 "guava:src/com/google/common/collect/ConcurrentHashMultiset.java": [
 88,
-88,
 128
 ],
 "guava:src/com/google/common/collect/Constraints.java": [
@@ -197,8 +190,7 @@
 57
 ],
 "guava:src/com/google/common/collect/EnumHashBiMap.java": [
-56,
-122
+56
 ],
 "guava:src/com/google/common/collect/EnumMultiset.java": [
 42,
@@ -227,9 +219,6 @@
 ],
 "guava:src/com/google/common/collect/HashBasedTable.java": [
 76,
-76,
-76,
-92,
 92
 ],
 "guava:src/com/google/common/collect/HashBiMap.java": [
@@ -242,13 +231,11 @@
 "guava:src/com/google/common/collect/HashMultimap.java": [
 60,
 73,
-84,
-88
+84
 ],
 "guava:src/com/google/common/collect/HashMultiset.java": [
 42,
-53,
-71
+53
 ],
 "guava:src/com/google/common/collect/ImmutableBiMap.java": [
 49,
@@ -295,7 +282,6 @@
 ],
 "guava:src/com/google/common/collect/ImmutableMultimap.java": [
 126,
-136,
 166,
 284,
 525,
@@ -340,7 +326,6 @@
 ],
 "guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
 134,
-143,
 272,
 321,
 335,
@@ -352,11 +337,7 @@
 67,
 74,
 100,
-101,
 353,
-354,
-354,
-355,
 365,
 377,
 385,
@@ -369,7 +350,6 @@
 74,
 262,
 270,
-271,
 282,
 305,
 364,
@@ -412,7 +392,6 @@
 "guava:src/com/google/common/collect/LinkedHashMultimap.java": [
 90,
 104,
-227,
 231,
 246,
 428,
@@ -421,9 +400,7 @@
 ],
 "guava:src/com/google/common/collect/LinkedHashMultiset.java": [
 52,
-63,
-83,
-105
+63
 ],
 "guava:src/com/google/common/collect/LinkedListMultimap.java": [
 174,
@@ -431,7 +408,6 @@
 197,
 205,
 221,
-224,
 232,
 789
 ],
@@ -464,7 +440,6 @@
 294,
 341,
 380,
-381,
 460,
 782
 ],
@@ -611,7 +586,6 @@
 ],
 "guava:src/com/google/common/collect/MutableClassToInstanceMap.java": [
 45,
-46,
 56
 ],
 "guava:src/com/google/common/collect/Ordering.java": [
@@ -723,7 +697,6 @@
 955,
 1162,
 1188,
-1188,
 1266,
 1333,
 1426,
@@ -739,8 +712,6 @@
 151
 ],
 "guava:src/com/google/common/collect/SparseImmutableTable.java": [
-42,
-46,
 69,
 76
 ],
@@ -787,17 +758,13 @@
 106,
 122,
 132,
-140,
-141,
 197
 ],
 "guava:src/com/google/common/collect/TreeMultimap.java": [
 89,
 103,
 115,
-121,
-142,
-260
+142
 ],
 "guava:src/com/google/common/collect/TreeMultiset.java": [
 74,
@@ -813,20 +780,15 @@
 977
 ],
 "guava:src/com/google/common/collect/TreeRangeMap.java": [
-61,
-129,
-158
+61
 ],
 "guava:src/com/google/common/collect/TreeRangeSet.java": [
 54,
-54,
 280,
 434,
 443,
-612,
 658,
-665,
-808
+665
 ],
 "guava:src/com/google/common/collect/TreeTraverser.java": [
 88,
@@ -901,11 +863,7 @@
 191,
 327
 ],
-"guava:src/com/google/common/util/concurrent/AbstractService.java": [
-411
-],
 "guava:src/com/google/common/util/concurrent/AtomicLongMap.java": [
-66,
 66
 ],
 "guava:src/com/google/common/util/concurrent/Atomics.java": [
@@ -942,8 +900,7 @@
 1621
 ],
 "guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
-155,
-180
+155
 ],
 "guava:src/com/google/common/util/concurrent/JdkFutureAdapters.java": [
 63,
@@ -963,8 +920,7 @@
 57
 ],
 "guava:src/com/google/common/util/concurrent/ServiceManager.java": [
-202,
-517
+202
 ],
 "guava:src/com/google/common/util/concurrent/SettableFuture.java": [
 39
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2325.json b/its/ruling/src/test/resources/expected/guava/java-S2325.json
index 9cee686bada..1ab3597dd9f 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2325.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2325.json
@@ -1,6 +1,13 @@
 {
+"guava:src/com/google/common/base/Splitter.java": [
+459
+],
 "guava:src/com/google/common/cache/LocalCache.java": [
-1964
+1964,
+3515
+],
+"guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
+395
 ],
 "guava:src/com/google/common/collect/HashBiMap.java": [
 358
@@ -8,6 +15,13 @@
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 1975
 ],
+"guava:src/com/google/common/collect/TreeRangeMap.java": [
+263
+],
+"guava:src/com/google/common/hash/BloomFilterStrategies.java": [
+130,
+135
+],
 "guava:src/com/google/common/io/ByteSource.java": [
 213,
 236
@@ -15,7 +29,17 @@
 "guava:src/com/google/common/io/CharSource.java": [
 154
 ],
+"guava:src/com/google/common/math/LongMath.java": [
+810,
+817
+],
+"guava:src/com/google/common/reflect/Invokable.java": [
+147
+],
 "guava:src/com/google/common/util/concurrent/CycleDetectingLockFactory.java": [
 773
+],
+"guava:src/com/google/common/util/concurrent/Futures.java": [
+1335
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2384.json b/its/ruling/src/test/resources/expected/guava/java-S2384.json
index 2d75ded93c2..5c7467caf71 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2384.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2384.json
@@ -22,10 +22,6 @@
 "guava:src/com/google/common/collect/ConcurrentHashMultiset.java": [
 144
 ],
-"guava:src/com/google/common/collect/Constraints.java": [
-69,
-112
-],
 "guava:src/com/google/common/collect/EvictingQueue.java": [
 80
 ],
@@ -41,16 +37,11 @@
 "guava:src/com/google/common/collect/ImmutableMapEntrySet.java": [
 42
 ],
-"guava:src/com/google/common/collect/Lists.java": [
-813
-],
 "guava:src/com/google/common/collect/MapConstraints.java": [
-309,
 653,
 658
 ],
 "guava:src/com/google/common/collect/Maps.java": [
-767,
 1316,
 1320,
 3133,
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2387.json b/its/ruling/src/test/resources/expected/guava/java-S2387.json
index b2438d3406c..54a0a64ec20 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2387.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2387.json
@@ -4,6 +4,18 @@
 4230,
 4239
 ],
+"guava:src/com/google/common/collect/DenseImmutableTable.java": [
+41
+],
+"guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
+434
+],
+"guava:src/com/google/common/collect/ImmutableSortedMap.java": [
+505
+],
+"guava:src/com/google/common/collect/Iterables.java": [
+85
+],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 1241,
 1499,
@@ -13,5 +25,8 @@
 "guava:src/com/google/common/collect/Maps.java": [
 3384,
 3395
+],
+"guava:src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java": [
+33
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2388.json b/its/ruling/src/test/resources/expected/guava/java-S2388.json
index 9bd0096e58f..e8d6df90e58 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2388.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2388.json
@@ -12,9 +12,6 @@
 990,
 1000
 ],
-"guava:src/com/google/common/collect/ConcurrentHashMultiset.java": [
-579
-],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 1182,
 1439,
@@ -25,12 +22,5 @@
 ],
 "guava:src/com/google/common/io/BaseEncoding.java": [
 870
-],
-"guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
-58
-],
-"guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
-207,
-237
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2629.json b/its/ruling/src/test/resources/expected/guava/java-S2629.json
index 5b107c96c03..ff76e61c2b6 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2629.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2629.json
@@ -1,7 +1,4 @@
 {
-"guava:src/com/google/common/io/Closer.java": [
-253
-],
 "guava:src/com/google/common/reflect/ClassPath.java": [
 448
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2694.json b/its/ruling/src/test/resources/expected/guava/java-S2694.json
index 48dc4130fd5..cf2dd4a1bd8 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2694.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2694.json
@@ -1,6 +1,6 @@
 {
-"guava:src/com/google/common/cache/LocalCache.java": [
-4449
+"guava:src/com/google/common/collect/FilteredKeySetMultimap.java": [
+70
 ],
 "guava:src/com/google/common/reflect/Types.java": [
 137
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2885.json b/its/ruling/src/test/resources/expected/guava/java-S2885.json
new file mode 100644
index 00000000000..95379632116
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S2885.json
@@ -0,0 +1,6 @@
+{
+"guava:src/com/google/common/base/Throwables.java": [
+314,
+321
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S2972.json b/its/ruling/src/test/resources/expected/guava/java-S2972.json
index ebb84361644..3c996aca155 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S2972.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S2972.json
@@ -77,7 +77,6 @@
 "guava:src/com/google/common/cache/LocalCache.java": [
 372,
 442,
-687,
 851,
 926,
 1064,
@@ -141,7 +140,6 @@
 604
 ],
 "guava:src/com/google/common/collect/ComparisonChain.java": [
-78,
 135
 ],
 "guava:src/com/google/common/collect/ComputingConcurrentHashMap.java": [
@@ -182,7 +180,9 @@
 "guava:src/com/google/common/collect/HashBiMap.java": [
 390,
 435,
-526
+477,
+526,
+634
 ],
 "guava:src/com/google/common/collect/ImmutableBiMap.java": [
 121
@@ -248,7 +248,6 @@
 67
 ],
 "guava:src/com/google/common/collect/Iterators.java": [
-74,
 1154,
 1287
 ],
@@ -425,7 +424,6 @@
 "guava:src/com/google/common/collect/TreeRangeMap.java": [
 68,
 216,
-268,
 326
 ],
 "guava:src/com/google/common/collect/TreeRangeSet.java": [
@@ -450,8 +448,6 @@
 85
 ],
 "guava:src/com/google/common/hash/BloomFilterStrategies.java": [
-44,
-92,
 142
 ],
 "guava:src/com/google/common/hash/Crc32cHashFunction.java": [
@@ -577,18 +573,11 @@
 456,
 531
 ],
-"guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
-43
-],
 "guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
 857
 ],
-"guava:src/com/google/common/util/concurrent/AbstractIdleService.java": [
-47
-],
 "guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
 112,
-164,
 414
 ],
 "guava:src/com/google/common/util/concurrent/AbstractService.java": [
diff --git a/its/ruling/src/test/resources/expected/guava/java-S3038.json b/its/ruling/src/test/resources/expected/guava/java-S3038.json
index dd559a80e79..078892f4894 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S3038.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S3038.json
@@ -10,10 +10,19 @@
 32,
 79
 ],
+"guava:src/com/google/common/collect/ImmutableBiMap.java": [
+295
+],
+"guava:src/com/google/common/collect/ImmutableSortedMultiset.java": [
+293,
+338,
+352
+],
+"guava:src/com/google/common/collect/ImmutableTable.java": [
+290,
+317
+],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 3608
-],
-"guava:src/com/google/common/hash/Hashing.java": [
-320
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S3077.json b/its/ruling/src/test/resources/expected/guava/java-S3077.json
index d46251e104f..4746b9f5790 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S3077.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S3077.json
@@ -11,9 +11,6 @@
 "guava:src/com/google/common/cache/Striped64.java": [
 138
 ],
-"guava:src/com/google/common/collect/ComputingConcurrentHashMap.java": [
-292
-],
 "guava:src/com/google/common/collect/MapConstraints.java": [
 359
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S3252.json b/its/ruling/src/test/resources/expected/guava/java-S3252.json
new file mode 100644
index 00000000000..80622a74c9e
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/guava/java-S3252.json
@@ -0,0 +1,11 @@
+{
+"guava:src/com/google/common/collect/ImmutableCollection.java": [
+290
+],
+"guava:src/com/google/common/reflect/TypeToken.java": [
+205
+],
+"guava:src/com/google/common/util/concurrent/CycleDetectingLockFactory.java": [
+522
+]
+}
diff --git a/its/ruling/src/test/resources/expected/guava/java-S3398.json b/its/ruling/src/test/resources/expected/guava/java-S3398.json
index 3f7874561bb..2d9a970cda8 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S3398.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S3398.json
@@ -1,51 +1,30 @@
 {
+"guava:src/com/google/common/collect/AbstractBiMap.java": [
+140,
+152
+],
 "guava:src/com/google/common/collect/AbstractMapBasedMultimap.java": [
-607,
-1135
+607
 ],
 "guava:src/com/google/common/collect/Collections2.java": [
 679
 ],
-"guava:src/com/google/common/collect/Constraints.java": [
-281
-],
-"guava:src/com/google/common/collect/HashBiMap.java": [
-306
+"guava:src/com/google/common/collect/ImmutableSetMultimap.java": [
+305
 ],
 "guava:src/com/google/common/collect/MapConstraints.java": [
-190,
-216,
-250,
-268,
-770,
-780
+291
 ],
 "guava:src/com/google/common/collect/Maps.java": [
-455,
 978,
-3164
-],
-"guava:src/com/google/common/collect/Multimaps.java": [
-826,
-847
-],
-"guava:src/com/google/common/collect/SortedMultisets.java": [
-156,
-163
-],
-"guava:src/com/google/common/collect/StandardRowSortedTable.java": [
-63
-],
-"guava:src/com/google/common/collect/StandardTable.java": [
-162,
-185
+997
 ],
 "guava:src/com/google/common/collect/Synchronized.java": [
+816,
+816,
+816,
 1507
 ],
-"guava:src/com/google/common/collect/TreeRangeMap.java": [
-263
-],
 "guava:src/com/google/common/collect/TreeRangeSet.java": [
 132
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S3457.json b/its/ruling/src/test/resources/expected/guava/java-S3457.json
index aa75d24c7b8..66d8aaab872 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S3457.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S3457.json
@@ -1,7 +1,4 @@
 {
-"guava:src/com/google/common/io/Closer.java": [
-252
-],
 "guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
 822
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S3878.json b/its/ruling/src/test/resources/expected/guava/java-S3878.json
index 2ac01f3fb60..62120055156 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S3878.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S3878.json
@@ -1,5 +1,10 @@
 {
-"guava:src/com/google/common/collect/ArrayTable.java": [
-360
+"guava:src/com/google/common/hash/Hashing.java": [
+485,
+506
+],
+"guava:src/com/google/common/util/concurrent/ServiceManager.java": [
+642,
+751
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S4248.json b/its/ruling/src/test/resources/expected/guava/java-S4248.json
index 0a214cd2ea2..b0244ea3c1b 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S4248.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S4248.json
@@ -1,7 +1,4 @@
 {
-"guava:src/com/google/common/net/InternetDomainName.java": [
-510
-],
 "guava:src/com/google/common/net/PercentEscaper.java": [
 100
 ]
diff --git a/its/ruling/src/test/resources/expected/guava/java-S4551.json b/its/ruling/src/test/resources/expected/guava/java-S4551.json
index 8446a269050..080543148be 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S4551.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S4551.json
@@ -2,9 +2,5 @@
 "guava:src/com/google/common/base/CaseFormat.java": [
 200,
 200
-],
-"guava:src/com/google/common/collect/GeneralRange.java": [
-235,
-236
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S4738.json b/its/ruling/src/test/resources/expected/guava/java-S4738.json
index a61f4ed0963..f93f011a211 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S4738.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S4738.json
@@ -192,8 +192,7 @@
 149
 ],
 "guava:src/com/google/common/collect/ImmutableCollection.java": [
-288,
-290
+288
 ],
 "guava:src/com/google/common/collect/ImmutableList.java": [
 252,
diff --git a/its/ruling/src/test/resources/expected/guava/java-S5803.json b/its/ruling/src/test/resources/expected/guava/java-S5803.json
index ae193f2ba4f..b144ac3d4fe 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S5803.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S5803.json
@@ -1,8 +1,5 @@
 {
-"guava:src/com/google/common/io/Closer.java": [
-252
-],
 "guava:src/com/google/common/util/concurrent/SmoothRateLimiter.java": [
-213
+327
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S6201.json b/its/ruling/src/test/resources/expected/guava/java-S6201.json
index ec62bcf76c5..2f5c145319d 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S6201.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S6201.json
@@ -29,6 +29,9 @@
 "guava:src/com/google/common/collect/ImmutableClassToInstanceMap.java": [
 150
 ],
+"guava:src/com/google/common/collect/ImmutableEnumSet.java": [
+82
+],
 "guava:src/com/google/common/collect/ImmutableSet.java": [
 243
 ],
@@ -220,6 +223,7 @@
 "guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
 470,
 472,
+519,
 569,
 692
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S6212.json b/its/ruling/src/test/resources/expected/guava/java-S6212.json
index 5c84a3e8390..823e795d170 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S6212.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S6212.json
@@ -99,10 +99,6 @@
 195,
 218
 ],
-"guava:src/com/google/common/base/Suppliers.java": [
-131,
-199
-],
 "guava:src/com/google/common/base/Throwables.java": [
 215,
 335
@@ -120,15 +116,13 @@
 202
 ],
 "guava:src/com/google/common/cache/AbstractCache.java": [
-71,
-72
+71
 ],
 "guava:src/com/google/common/cache/CacheBuilder.java": [
 831
 ],
 "guava:src/com/google/common/cache/CacheBuilderSpec.java": [
 137,
-147,
 418,
 439
 ],
@@ -140,13 +134,10 @@
 305,
 1890,
 2145,
-2183,
 2216,
 2230,
 2237,
 2302,
-2331,
-2367,
 2419,
 2486,
 2500,
@@ -174,7 +165,6 @@
 3342,
 3376,
 3536,
-3538,
 3699,
 3836,
 3888,
@@ -189,12 +179,9 @@
 3979,
 3980,
 3985,
-4002,
 4032,
 4034,
 4065,
-4067,
-4068,
 4130,
 4131,
 4138,
@@ -224,24 +211,13 @@
 260,
 284
 ],
-"guava:src/com/google/common/collect/AbstractBiMap.java": [
-135,
-153,
-342,
-353
-],
 "guava:src/com/google/common/collect/AbstractIterator.java": [
 157
 ],
 "guava:src/com/google/common/collect/AbstractMapBasedMultimap.java": [
-827,
 973,
 1138,
-1288,
-1341
-],
-"guava:src/com/google/common/collect/AbstractMapBasedMultiset.java": [
-107
+1288
 ],
 "guava:src/com/google/common/collect/AbstractMapEntry.java": [
 58,
@@ -257,11 +233,6 @@
 626,
 716
 ],
-"guava:src/com/google/common/collect/BinaryTreeTraverser.java": [
-114,
-152,
-192
-],
 "guava:src/com/google/common/collect/CartesianList.java": [
 54
 ],
@@ -269,25 +240,17 @@
 170,
 437,
 438,
-532,
 632
 ],
 "guava:src/com/google/common/collect/CompoundOrdering.java": [
 41
 ],
 "guava:src/com/google/common/collect/ComputingConcurrentHashMap.java": [
-83,
 93,
-105,
-113,
-159,
-190,
-327,
-437
+327
 ],
 "guava:src/com/google/common/collect/ConcurrentHashMultiset.java": [
 169,
-198,
 239,
 252,
 382,
@@ -297,55 +260,32 @@
 56,
 57,
 58,
-60,
-61,
 64,
 127,
-258,
-259,
 260
 ],
 "guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
 151,
-154,
 187,
 199,
-203,
-263,
-309,
 361,
-362,
-365
+362
 ],
 "guava:src/com/google/common/collect/FilteredKeyMultimap.java": [
 61,
 72
 ],
-"guava:src/com/google/common/collect/FluentIterable.java": [
-329
-],
 "guava:src/com/google/common/collect/ForwardingCollection.java": [
 241
 ],
-"guava:src/com/google/common/collect/ForwardingMap.java": [
-168
-],
 "guava:src/com/google/common/collect/ForwardingMapEntry.java": [
 114,
 115
 ],
 "guava:src/com/google/common/collect/GeneralRange.java": [
-160,
-169,
-186,
 187,
-201,
 202
 ],
-"guava:src/com/google/common/collect/HashBiMap.java": [
-496,
-653
-],
 "guava:src/com/google/common/collect/Hashing.java": [
 60
 ],
@@ -372,9 +312,6 @@
 632,
 646
 ],
-"guava:src/com/google/common/collect/ImmutableMapEntrySet.java": [
-74
-],
 "guava:src/com/google/common/collect/ImmutableMultiset.java": [
 385,
 395
@@ -407,10 +344,7 @@
 325,
 326,
 329,
-339,
-342,
-343,
-344
+342
 ],
 "guava:src/com/google/common/collect/ImmutableSortedMultiset.java": [
 263,
@@ -424,39 +358,23 @@
 378,
 380
 ],
-"guava:src/com/google/common/collect/Interners.java": [
-49,
-81
-],
 "guava:src/com/google/common/collect/Iterables.java": [
 182,
-183,
-186,
-236,
-876
+183
 ],
 "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
+1174
 ],
 "guava:src/com/google/common/collect/LinkedHashMultimap.java": [
 329,
-382,
 443,
 561,
 563,
@@ -486,8 +404,7 @@
 ],
 "guava:src/com/google/common/collect/MapMaker.java": [
 593,
-841,
-842
+841
 ],
 "guava:src/com/google/common/collect/MapMakerInternalMap.java": [
 226,
@@ -502,7 +419,6 @@
 2409,
 2442,
 2480,
-2482,
 2516,
 2522,
 2592,
@@ -540,16 +456,12 @@
 4006
 ],
 "guava:src/com/google/common/collect/Maps.java": [
-442,
 527,
 799,
 810,
 940,
-1135,
-1207,
 2635,
-2656,
-2911,
+3833,
 4078
 ],
 "guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
@@ -569,17 +481,13 @@
 935
 ],
 "guava:src/com/google/common/collect/Multimaps.java": [
-1510,
 1623
 ],
 "guava:src/com/google/common/collect/Multisets.java": [
 328,
-488,
-626,
 696,
 743,
 779,
-818,
 830
 ],
 "guava:src/com/google/common/collect/ObjectArrays.java": [
@@ -588,19 +496,13 @@
 230
 ],
 "guava:src/com/google/common/collect/Ordering.java": [
-504,
-580,
-723,
 725,
-730,
-736,
 745,
 748,
 783
 ],
 "guava:src/com/google/common/collect/Queues.java": [
 269,
-275,
 304,
 305
 ],
@@ -609,14 +511,10 @@
 ],
 "guava:src/com/google/common/collect/RegularImmutableBiMap.java": [
 68,
-70,
-73,
-74
+70
 ],
 "guava:src/com/google/common/collect/RegularImmutableMap.java": [
-65,
-67,
-68
+65
 ],
 "guava:src/com/google/common/collect/RegularImmutableMultiset.java": [
 51,
@@ -642,7 +540,6 @@
 196
 ],
 "guava:src/com/google/common/collect/Sets.java": [
-902,
 1219,
 1224,
 1291,
@@ -662,18 +559,11 @@
 "guava:src/com/google/common/collect/SparseImmutableTable.java": [
 48,
 49,
-50,
-52,
-53,
-54,
-59
+50
 ],
 "guava:src/com/google/common/collect/StandardTable.java": [
 117,
-155,
-168,
 415,
-421,
 445,
 592,
 608,
@@ -690,24 +580,15 @@
 272,
 276,
 305,
-328,
-363,
-385
+328
 ],
 "guava:src/com/google/common/collect/TreeRangeMap.java": [
 517
 ],
-"guava:src/com/google/common/collect/TreeTraverser.java": [
-157,
-210
-],
 "guava:src/com/google/common/escape/ArrayBasedCharEscaper.java": [
 119,
 120
 ],
-"guava:src/com/google/common/escape/ArrayBasedEscaperMap.java": [
-82
-],
 "guava:src/com/google/common/escape/ArrayBasedUnicodeEscaper.java": [
 154,
 155,
@@ -721,8 +602,7 @@
 ],
 "guava:src/com/google/common/escape/CharEscaperBuilder.java": [
 58,
-59,
-115
+59
 ],
 "guava:src/com/google/common/escape/Escapers.java": [
 239,
@@ -906,8 +786,7 @@
 141
 ],
 "guava:src/com/google/common/io/Closer.java": [
-208,
-212
+208
 ],
 "guava:src/com/google/common/io/FileBackedOutputStream.java": [
 158,
@@ -1224,8 +1103,6 @@
 261,
 263,
 393,
-394,
-395,
 430
 ],
 "guava:src/com/google/common/primitives/UnsignedInts.java": [
@@ -1236,8 +1113,7 @@
 171,
 222,
 227,
-258,
-285
+258
 ],
 "guava:src/com/google/common/primitives/UnsignedLong.java": [
 229
@@ -1284,7 +1160,6 @@
 190,
 195,
 197,
-261,
 320,
 335,
 398,
@@ -1307,14 +1182,10 @@
 139,
 215,
 294,
-380,
 436,
 490,
 569
 ],
-"guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
-45
-],
 "guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
 168,
 190,
@@ -1440,10 +1311,6 @@
 ],
 "guava:src/com/google/common/util/concurrent/ServiceManager.java": [
 271,
-475,
-588,
-589,
-632,
 690,
 698
 ],
@@ -1454,10 +1321,7 @@
 150,
 151,
 158,
-321,
-363,
-426,
-430
+321
 ],
 "guava:src/com/google/common/util/concurrent/ThreadFactoryBuilder.java": [
 154,
diff --git a/its/ruling/src/test/resources/expected/guava/java-S6548.json b/its/ruling/src/test/resources/expected/guava/java-S6548.json
index 196122772ff..15bd8d5a8fc 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S6548.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S6548.json
@@ -9,6 +9,9 @@
 1435,
 1451
 ],
+"guava:src/com/google/common/base/Converter.java": [
+463
+],
 "guava:src/com/google/common/base/Equivalence.java": [
 330,
 351
diff --git a/its/ruling/src/test/resources/expected/guava/java-S9357.json b/its/ruling/src/test/resources/expected/guava/java-S9357.json
index 439651b9df6..385d3a590cd 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S9357.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S9357.json
@@ -5,123 +5,37 @@
 "guava:src/com/google/common/base/Optional.java": [
 297
 ],
-"guava:src/com/google/common/base/Splitter.java": [
-148,
-179,
-230,
-294
-],
-"guava:src/com/google/common/cache/CacheBuilder.java": [
-183
-],
 "guava:src/com/google/common/cache/LocalCache.java": [
-2327,
-3547
-],
-"guava:src/com/google/common/cache/LongAddables.java": [
-38,
-45
+2327
 ],
 "guava:src/com/google/common/cache/RemovalListeners.java": [
-45,
 48
 ],
-"guava:src/com/google/common/collect/Collections2.java": [
-302
-],
-"guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
-398
-],
-"guava:src/com/google/common/collect/Interners.java": [
-46
-],
-"guava:src/com/google/common/collect/Iterables.java": [
-1014
-],
 "guava:src/com/google/common/collect/Iterators.java": [
 1296
 ],
-"guava:src/com/google/common/collect/MapConstraints.java": [
-227,
-485
-],
 "guava:src/com/google/common/collect/Maps.java": [
-1863,
-1874,
-1888,
-1922,
-3098
-],
-"guava:src/com/google/common/collect/Multimaps.java": [
-519,
-1202,
-1702
-],
-"guava:src/com/google/common/collect/Multisets.java": [
-305
-],
-"guava:src/com/google/common/collect/MutableClassToInstanceMap.java": [
-64
-],
-"guava:src/com/google/common/collect/Range.java": [
-117,
-129
+1863
 ],
 "guava:src/com/google/common/collect/RegularImmutableTable.java": [
 114
 ],
-"guava:src/com/google/common/collect/StandardTable.java": [
-721,
-794
-],
-"guava:src/com/google/common/collect/Tables.java": [
-240,
-390,
-419,
-429,
-592
-],
-"guava:src/com/google/common/collect/TreeBasedTable.java": [
-321
-],
-"guava:src/com/google/common/escape/Escaper.java": [
-90
-],
 "guava:src/com/google/common/eventbus/Subscriber.java": [
 76
 ],
 "guava:src/com/google/common/io/CharSource.java": [
 442
 ],
-"guava:src/com/google/common/net/MediaType.java": [
-406,
-744
-],
-"guava:src/com/google/common/reflect/ClassPath.java": [
-64
-],
-"guava:src/com/google/common/reflect/MutableTypeToInstanceMap.java": [
-124
-],
-"guava:src/com/google/common/reflect/TypeToken.java": [
-701
-],
-"guava:src/com/google/common/reflect/Types.java": [
-61
-],
 "guava:src/com/google/common/util/concurrent/AbstractExecutionThreadService.java": [
-45,
 50,
 145
 ],
 "guava:src/com/google/common/util/concurrent/AbstractIdleService.java": [
-40,
 50,
 64,
 95
 ],
 "guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
-205,
 210,
 232,
 304
@@ -129,23 +43,16 @@
 "guava:src/com/google/common/util/concurrent/AggregateFuture.java": [
 138
 ],
-"guava:src/com/google/common/util/concurrent/AtomicLongMap.java": [
-294
-],
 "guava:src/com/google/common/util/concurrent/Callables.java": [
 44,
 94
 ],
 "guava:src/com/google/common/util/concurrent/Futures.java": [
 1168,
-1494,
 1569,
 1662,
 1749
 ],
-"guava:src/com/google/common/util/concurrent/FuturesGetChecked.java": [
-253
-],
 "guava:src/com/google/common/util/concurrent/JdkFutureAdapters.java": [
 160
 ],
@@ -157,16 +64,6 @@
 "guava:src/com/google/common/util/concurrent/Runnables.java": [
 31
 ],
-"guava:src/com/google/common/util/concurrent/ServiceManager.java": [
-598
-],
-"guava:src/com/google/common/util/concurrent/Striped.java": [
-199,
-214,
-236,
-252,
-283
-],
 "guava:src/com/google/common/util/concurrent/ThreadFactoryBuilder.java": [
 161
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S9358.json b/its/ruling/src/test/resources/expected/guava/java-S9358.json
index 49cc1861a22..803f32fa870 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S9358.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S9358.json
@@ -1,8 +1,4 @@
 {
-"guava:src/com/google/common/collect/RegularImmutableTable.java": [
-151,
-155
-],
 "guava:src/com/google/common/collect/TreeMultiset.java": [
 91
 ],
diff --git a/its/ruling/src/test/resources/expected/guava/java-S9391.json b/its/ruling/src/test/resources/expected/guava/java-S9391.json
index 985b323d4de..d793a052532 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S9391.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S9391.json
@@ -1,10 +1,4 @@
 {
-"guava:src/com/google/common/base/Predicates.java": [
-707
-],
-"guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
-222
-],
 "guava:src/com/google/common/hash/Hashing.java": [
 502
 ]
diff --git a/its/ruling/src/test/resources/expected/guava/java-S9395.json b/its/ruling/src/test/resources/expected/guava/java-S9395.json
index 3fbdac99419..0e5adcae5aa 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S9395.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S9395.json
@@ -1,6 +1,7 @@
 {
 "guava:src/com/google/common/math/DoubleMath.java": [
-446
+446,
+450
 ],
 "guava:src/com/google/common/math/DoubleUtils.java": [
 97
@@ -11,5 +12,10 @@
 "guava:src/com/google/common/primitives/UnsignedInteger.java": [
 201,
 210
+],
+"guava:src/com/google/common/util/concurrent/SmoothRateLimiter.java": [
+260,
+334,
+343
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S9396.json b/its/ruling/src/test/resources/expected/guava/java-S9396.json
index 2c63c085104..c4d039268de 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S9396.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S9396.json
@@ -1,2 +1,206 @@
 {
+"guava:src/com/google/common/cache/LocalCache.java": [
+4262,
+4263,
+4264,
+4265,
+4266,
+4267,
+4268,
+4394,
+4395,
+4450,
+4495
+],
+"guava:src/com/google/common/collect/AbstractBiMap.java": [
+243,
+281
+],
+"guava:src/com/google/common/collect/AbstractMapBasedMultimap.java": [
+356,
+357,
+358,
+359,
+460,
+461,
+1148,
+1149,
+1150,
+1151,
+1263,
+1377,
+1378,
+1441
+],
+"guava:src/com/google/common/collect/AbstractMapBasedMultiset.java": [
+161,
+162,
+163,
+164
+],
+"guava:src/com/google/common/collect/ArrayTable.java": [
+588,
+678
+],
+"guava:src/com/google/common/collect/BinaryTreeTraverser.java": [
+100,
+135,
+136,
+180,
+181
+],
+"guava:src/com/google/common/collect/DenseImmutableTable.java": [
+139,
+163
+],
+"guava:src/com/google/common/collect/FilteredEntryMultimap.java": [
+76
+],
+"guava:src/com/google/common/collect/HashBiMap.java": [
+391,
+392,
+393,
+478,
+635
+],
+"guava:src/com/google/common/collect/ImmutableList.java": [
+392,
+393
+],
+"guava:src/com/google/common/collect/ImmutableMultimap.java": [
+563,
+564,
+565
+],
+"guava:src/com/google/common/collect/ImmutableRangeSet.java": [
+199,
+202,
+204,
+391,
+398
+],
+"guava:src/com/google/common/collect/LinkedHashMultimap.java": [
+311,
+312,
+313,
+314,
+318,
+319
+],
+"guava:src/com/google/common/collect/LinkedListMultimap.java": [
+318,
+319,
+320,
+321,
+322,
+412,
+413,
+414,
+415,
+450,
+451,
+452,
+453,
+454
+],
+"guava:src/com/google/common/collect/MapMakerInternalMap.java": [
+3594,
+3595,
+3596,
+3597,
+3598,
+3599,
+3600,
+3725,
+3726
+],
+"guava:src/com/google/common/collect/MinMaxPriorityQueue.java": [
+504,
+505,
+764,
+765,
+766,
+767,
+768,
+769
+],
+"guava:src/com/google/common/collect/StandardTable.java": [
+229,
+231,
+232,
+262,
+268,
+388,
+484,
+656,
+657,
+658
+],
+"guava:src/com/google/common/collect/TreeBasedTable.java": [
+181,
+182,
+248
+],
+"guava:src/com/google/common/collect/TreeRangeMap.java": [
+218,
+328
+],
+"guava:src/com/google/common/collect/TreeRangeSet.java": [
+89,
+805
+],
+"guava:src/com/google/common/collect/TreeTraverser.java": [
+85,
+145,
+191
+],
+"guava:src/com/google/common/hash/AbstractNonStreamingHashFunction.java": [
+83
+],
+"guava:src/com/google/common/hash/ChecksumHashFunction.java": [
+61
+],
+"guava:src/com/google/common/io/ByteSink.java": [
+140
+],
+"guava:src/com/google/common/io/ByteSource.java": [
+450,
+472,
+473
+],
+"guava:src/com/google/common/reflect/TypeToken.java": [
+630,
+673,
+674,
+722
+],
+"guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
+259
+],
+"guava:src/com/google/common/util/concurrent/AbstractScheduledService.java": [
+422,
+425,
+431,
+438,
+442
+],
+"guava:src/com/google/common/util/concurrent/AggregateFuture.java": [
+90,
+91,
+92
+],
+"guava:src/com/google/common/util/concurrent/CollectionFuture.java": [
+38
+],
+"guava:src/com/google/common/util/concurrent/CycleDetectingLockFactory.java": [
+791,
+871,
+872,
+874,
+912,
+974
+],
+"guava:src/com/google/common/util/concurrent/TrustedListenableFutureTask.java": [
+96
+]
 }
diff --git a/its/ruling/src/test/resources/expected/guava/java-S9434.json b/its/ruling/src/test/resources/expected/guava/java-S9434.json
index 72964a4892c..e1a48b315e9 100644
--- a/its/ruling/src/test/resources/expected/guava/java-S9434.json
+++ b/its/ruling/src/test/resources/expected/guava/java-S9434.json
@@ -1,5 +1,12 @@
 {
 "guava:src/com/google/common/collect/TreeRangeMap.java": [
 547
+],
+"guava:src/com/google/common/util/concurrent/AbstractFuture.java": [
+728
+],
+"guava:src/com/google/common/util/concurrent/ListenerCallQueue.java": [
+106,
+131
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S112.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S112.json
index 6a09551c09e..f112534bb67 100644
--- a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S112.json
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S112.json
@@ -20,6 +20,16 @@
 35,
 37
 ],
+"jboss-ejb3-tutorial:ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession1Bean.java": [
+44
+],
+"jboss-ejb3-tutorial:ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java": [
+54
+],
+"jboss-ejb3-tutorial:ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/client/Client.java": [
+38,
+50
+],
 "jboss-ejb3-tutorial:extended_pc/src/org/jboss/tutorial/extended/client/Client.java": [
 41
 ],
@@ -44,6 +54,9 @@
 "jboss-ejb3-tutorial:reference21_30/ejb3_app/src/main/java/org/jboss/tutorial/reference21_30/bean/Stateless3.java": [
 30
 ],
+"jboss-ejb3-tutorial:reference21_30/ejb3_app/src/main/java/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java": [
+52
+],
 "jboss-ejb3-tutorial:relationships/src/org/jboss/tutorial/relationships/bean/EntityTest.java": [
 34,
 36
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1128.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1128.json
index 94d124bab65..af111261852 100644
--- a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1128.json
@@ -5,5 +5,14 @@
 "jboss-ejb3-tutorial:service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/bean/ServiceThreeManagement.java": [
 24,
 25
+],
+"jboss-ejb3-tutorial:service_deployment_descriptor/src/org/jboss/tutorial/service_deployment_descriptor/client/Client.java": [
+25
+],
+"jboss-ejb3-tutorial:stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java": [
+31
+],
+"jboss-ejb3-tutorial:stateless/src/org/jboss/tutorial/stateless/client/Client.java": [
+25
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1130.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1130.json
new file mode 100644
index 00000000000..1c676cfd037
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1130.json
@@ -0,0 +1,87 @@
+{
+"jboss-ejb3-tutorial:blob/src/org/jboss/tutorial/blob/client/Client.java": [
+37
+],
+"jboss-ejb3-tutorial:cachedentity/src/org/jboss/tutorial/cachedentity/client/CachedEntityRun.java": [
+41
+],
+"jboss-ejb3-tutorial:callbacks/src/org/jboss/tutorial/callback/client/Client.java": [
+34
+],
+"jboss-ejb3-tutorial:composite/src/org/jboss/tutorial/composite/client/Client.java": [
+38
+],
+"jboss-ejb3-tutorial:dependency/src/org/jboss/tutorial/dependency/client/Client.java": [
+36
+],
+"jboss-ejb3-tutorial:ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/DeploymentDescriptorSession1Bean.java": [
+44
+],
+"jboss-ejb3-tutorial:ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/bean/Session1Bean.java": [
+54
+],
+"jboss-ejb3-tutorial:ejb21_client_adaptors/src/org/jboss/tutorial/ejb21_client_adaptors/client/Client.java": [
+38,
+50
+],
+"jboss-ejb3-tutorial:embeddable/src/org/jboss/tutorial/embeddable/client/Client.java": [
+34
+],
+"jboss-ejb3-tutorial:entity/src/org/jboss/tutorial/entity/client/Client.java": [
+39
+],
+"jboss-ejb3-tutorial:extended_pc/src/org/jboss/tutorial/extended/client/Client.java": [
+41
+],
+"jboss-ejb3-tutorial:hibernate/src/org/jboss/tutorial/hibernate/client/Client.java": [
+42
+],
+"jboss-ejb3-tutorial:injection/src/org/jboss/tutorial/injection/client/Client.java": [
+39
+],
+"jboss-ejb3-tutorial:interceptor/src/org/jboss/tutorial/interceptor/client/Client.java": [
+29
+],
+"jboss-ejb3-tutorial:jndibinding/src/org/jboss/tutorial/jndibinding/client/Client.java": [
+32
+],
+"jboss-ejb3-tutorial:joininheritance/src/org/jboss/tutorial/joininheritance/client/Client.java": [
+39
+],
+"jboss-ejb3-tutorial:merge/src/org/jboss/tutorial/merge/client/Client.java": [
+34
+],
+"jboss-ejb3-tutorial:reference21_30/ejb3_app/src/main/java/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java": [
+52
+],
+"jboss-ejb3-tutorial:relationships/src/org/jboss/tutorial/relationships/client/Client.java": [
+38
+],
+"jboss-ejb3-tutorial:resource_ref/src/org/jboss/tutorial/resource_ref/client/Client.java": [
+36
+],
+"jboss-ejb3-tutorial:secondary/src/org/jboss/tutorial/secondary/client/Client.java": [
+34
+],
+"jboss-ejb3-tutorial:singleinheritance/src/org/jboss/tutorial/singleinheritance/client/Client.java": [
+40
+],
+"jboss-ejb3-tutorial:stateful/src/org/jboss/tutorial/stateful/client/Client.java": [
+37
+],
+"jboss-ejb3-tutorial:stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java": [
+42
+],
+"jboss-ejb3-tutorial:stateless/src/org/jboss/tutorial/stateless/client/Client.java": [
+31
+],
+"jboss-ejb3-tutorial:stateless_deployment_descriptor/src/org/jboss/tutorial/stateless_deployment_descriptor/client/Client.java": [
+31
+],
+"jboss-ejb3-tutorial:tableperinheritance/src/org/jboss/tutorial/tableperinheritance/client/Client.java": [
+40
+],
+"jboss-ejb3-tutorial:timer/src/org/jboss/tutorial/timer/client/Client.java": [
+31
+]
+}
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1161.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1161.json
new file mode 100644
index 00000000000..741bf4a7c01
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1161.json
@@ -0,0 +1,5 @@
+{
+"jboss-ejb3-tutorial:interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsConfirmInterceptor.java": [
+58
+]
+}
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1948.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1948.json
index 8ee6dcd1326..16cf35fcf96 100644
--- a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1948.json
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S1948.json
@@ -2,5 +2,17 @@
 "jboss-ejb3-tutorial:blob/src/org/jboss/tutorial/blob/bean/BlobEntity.java": [
 45,
 46
+],
+"jboss-ejb3-tutorial:composite/src/org/jboss/tutorial/composite/bean/Customer.java": [
+41
+],
+"jboss-ejb3-tutorial:composite/src/org/jboss/tutorial/composite/bean/Flight.java": [
+45
+],
+"jboss-ejb3-tutorial:relationships/src/org/jboss/tutorial/relationships/bean/Customer.java": [
+51
+],
+"jboss-ejb3-tutorial:relationships/src/org/jboss/tutorial/relationships/bean/Flight.java": [
+51
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2057.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2057.json
index 1df27f35376..dfd2db06e17 100644
--- a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2057.json
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2057.json
@@ -53,6 +53,12 @@
 "jboss-ejb3-tutorial:jndibinding/src/org/jboss/tutorial/jndibinding/bean/Customer.java": [
 37
 ],
+"jboss-ejb3-tutorial:joininheritance/src/org/jboss/tutorial/joininheritance/bean/Cat.java": [
+30
+],
+"jboss-ejb3-tutorial:joininheritance/src/org/jboss/tutorial/joininheritance/bean/Dog.java": [
+33
+],
 "jboss-ejb3-tutorial:joininheritance/src/org/jboss/tutorial/joininheritance/bean/Pet.java": [
 34
 ],
@@ -71,6 +77,12 @@
 "jboss-ejb3-tutorial:secondary/src/org/jboss/tutorial/secondary/bean/Customer.java": [
 36
 ],
+"jboss-ejb3-tutorial:singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/Cat.java": [
+35
+],
+"jboss-ejb3-tutorial:singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/Dog.java": [
+35
+],
 "jboss-ejb3-tutorial:singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/Pet.java": [
 36
 ],
@@ -80,6 +92,12 @@
 "jboss-ejb3-tutorial:stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/bean/ShoppingCartBean.java": [
 27
 ],
+"jboss-ejb3-tutorial:tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/Cat.java": [
+27
+],
+"jboss-ejb3-tutorial:tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/Dog.java": [
+27
+],
 "jboss-ejb3-tutorial:tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/Pet.java": [
 33
 ]
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2184.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2184.json
new file mode 100644
index 00000000000..019cda039e3
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2184.json
@@ -0,0 +1,5 @@
+{
+"jboss-ejb3-tutorial:entity/src/org/jboss/tutorial/entity/bean/Order.java": [
+73
+]
+}
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2221.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2221.json
new file mode 100644
index 00000000000..bfe12e9bbbd
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2221.json
@@ -0,0 +1,14 @@
+{
+"jboss-ejb3-tutorial:dependency/src/org/jboss/tutorial/dependency/client/Client.java": [
+46
+],
+"jboss-ejb3-tutorial:reference21_30/ejb21_app/src/main/java/org/jboss/tutorial/reference21_30/bean/Stateless2Bean.java": [
+46
+],
+"jboss-ejb3-tutorial:reference21_30/ejb3_app/src/main/java/org/jboss/tutorial/reference21_30/bean/Stateless3Bean.java": [
+67
+],
+"jboss-ejb3-tutorial:reference21_30/webapp/src/main/java/org/jboss/tutorial/reference21_30/servlet/EJBReferenceServlet.java": [
+83
+]
+}
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2384.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2384.json
index 7c65bf26334..c31b733e4e5 100644
--- a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2384.json
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S2384.json
@@ -3,6 +3,14 @@
 59,
 64
 ],
+"jboss-ejb3-tutorial:cachedentity/src/org/jboss/tutorial/cachedentity/bean/Customer.java": [
+82,
+87
+],
+"jboss-ejb3-tutorial:entity/src/org/jboss/tutorial/entity/bean/Order.java": [
+81,
+86
+],
 "jboss-ejb3-tutorial:injection/src/org/jboss/tutorial/injection/bean/ShoppingCartBean.java": [
 66
 ],
diff --git a/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S4275.json b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S4275.json
new file mode 100644
index 00000000000..f13f27a9dda
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/jboss-ejb3-tutorial/java-S4275.json
@@ -0,0 +1,5 @@
+{
+"jboss-ejb3-tutorial:injection/src/org/jboss/tutorial/injection/bean/ShoppingCartBean.java": [
+44
+]
+}
diff --git a/its/ruling/src/test/resources/expected/mall/java-S112.json b/its/ruling/src/test/resources/expected/mall/java-S112.json
index b49a49aa285..027221b23ff 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S112.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S112.json
@@ -6,6 +6,9 @@
 47,
 51
 ],
+"mall:mall-demo/src/main/java/com/macro/mall/demo/config/SecurityConfig.java": [
+34
+],
 "mall:mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategoryExample.java": [
 88,
 95,
@@ -394,5 +397,11 @@
 88,
 95,
 102
+],
+"mall:mall-security/src/main/java/com/macro/mall/security/aspect/RedisCacheAspect.java": [
+32
+],
+"mall:mall-security/src/main/java/com/macro/mall/security/config/SecurityConfig.java": [
+40
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/mall/java-S1128.json b/its/ruling/src/test/resources/expected/mall/java-S1128.json
index 7dfdd6cb290..f762e1d5e8e 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S1128.json
@@ -2,6 +2,10 @@
 "mall:mall-admin/src/main/java/com/macro/mall/config/SpringDocConfig.java": [
 10
 ],
+"mall:mall-demo/src/main/java/com/macro/mall/demo/config/SecurityConfig.java": [
+10,
+13
+],
 "mall:mall-mbg/src/main/java/com/macro/mall/model/CmsHelp.java": [
 3
 ],
@@ -56,10 +60,26 @@
 "mall:mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelation.java": [
 3
 ],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderSender.java": [
+9
+],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/component/OrderTimeOutCancelTask.java": [
 8
 ],
+"mall:mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java": [
+4,
+10,
+27
+],
 "mall:mall-search/src/test/java/com/macro/mall/search/MallSearchApplicationTests.java": [
 10
+],
+"mall:mall-security/src/main/java/com/macro/mall/security/component/RestAuthenticationEntryPoint.java": [
+7,
+9
+],
+"mall:mall-security/src/main/java/com/macro/mall/security/component/RestfulAccessDeniedHandler.java": [
+7,
+9
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/mall/java-S1130.json b/its/ruling/src/test/resources/expected/mall/java-S1130.json
new file mode 100644
index 00000000000..40e37adf2af
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/mall/java-S1130.json
@@ -0,0 +1,11 @@
+{
+"mall:mall-demo/src/main/java/com/macro/mall/demo/config/SecurityConfig.java": [
+34
+],
+"mall:mall-mbg/src/main/java/com/macro/mall/Generator.java": [
+17
+],
+"mall:mall-security/src/main/java/com/macro/mall/security/config/SecurityConfig.java": [
+40
+]
+}
diff --git a/its/ruling/src/test/resources/expected/mall/java-S1144.json b/its/ruling/src/test/resources/expected/mall/java-S1144.json
index e573c06dbee..20f040be2dc 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S1144.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S1144.json
@@ -2,9 +2,15 @@
 "mall:mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java": [
 140
 ],
+"mall:mall-common/src/main/java/com/macro/mall/common/api/ResultCode.java": [
+16
+],
 "mall:mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java": [
 54
 ],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/domain/QueueEnum.java": [
+33
+],
 "mall:mall-security/src/main/java/com/macro/mall/security/util/JwtTokenUtil.java": [
 123
 ]
diff --git a/its/ruling/src/test/resources/expected/mall/java-S1155.json b/its/ruling/src/test/resources/expected/mall/java-S1155.json
index 4a082891ae5..803c40c8198 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S1155.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S1155.json
@@ -1,7 +1,14 @@
 {
+"mall:mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java": [
+69,
+88
+],
 "mall:mall-common/src/main/java/com/macro/mall/common/log/WebLogAspect.java": [
 119
 ],
+"mall:mall-demo/src/main/java/com/macro/mall/demo/config/SecurityConfig.java": [
+53
+],
 "mall:mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategoryExample.java": [
 49,
 75
diff --git a/its/ruling/src/test/resources/expected/mall/java-S1181.json b/its/ruling/src/test/resources/expected/mall/java-S1181.json
new file mode 100644
index 00000000000..e0c3ee8602b
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/mall/java-S1181.json
@@ -0,0 +1,5 @@
+{
+"mall:mall-security/src/main/java/com/macro/mall/security/aspect/RedisCacheAspect.java": [
+39
+]
+}
diff --git a/its/ruling/src/test/resources/expected/mall/java-S1226.json b/its/ruling/src/test/resources/expected/mall/java-S1226.json
new file mode 100644
index 00000000000..09559d36e7c
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/mall/java-S1226.json
@@ -0,0 +1,5 @@
+{
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java": [
+355
+]
+}
diff --git a/its/ruling/src/test/resources/expected/mall/java-S2109.json b/its/ruling/src/test/resources/expected/mall/java-S2109.json
new file mode 100644
index 00000000000..9f7462705ba
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/mall/java-S2109.json
@@ -0,0 +1,8 @@
+{
+"mall:mall-common/src/main/java/com/macro/mall/common/log/WebLogAspect.java": [
+66
+],
+"mall:mall-security/src/main/java/com/macro/mall/security/aspect/RedisCacheAspect.java": [
+41
+]
+}
diff --git a/its/ruling/src/test/resources/expected/mall/java-S2111.json b/its/ruling/src/test/resources/expected/mall/java-S2111.json
new file mode 100644
index 00000000000..bb18843217a
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/mall/java-S2111.json
@@ -0,0 +1,20 @@
+{
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java": [
+558,
+571,
+584,
+616,
+617,
+719,
+759,
+760
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java": [
+245
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java": [
+217,
+227,
+238
+]
+}
diff --git a/its/ruling/src/test/resources/expected/mall/java-S2184.json b/its/ruling/src/test/resources/expected/mall/java-S2184.json
index ef80ccf08ed..4c5f905bf75 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S2184.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S2184.json
@@ -1,5 +1,8 @@
 {
 "mall:mall-admin/src/main/java/com/macro/mall/service/impl/OssServiceImpl.java": [
 59
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java": [
+331
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/mall/java-S2325.json b/its/ruling/src/test/resources/expected/mall/java-S2325.json
index ef96d7635c4..fa3dec85465 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S2325.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S2325.json
@@ -9,8 +9,7 @@
 96
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java": [
-738,
-753
+738
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java": [
 265
diff --git a/its/ruling/src/test/resources/expected/mall/java-S2384.json b/its/ruling/src/test/resources/expected/mall/java-S2384.json
index 2c46fbbcfd6..9ccf9ab6b3c 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S2384.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S2384.json
@@ -1,4 +1,7 @@
 {
+"mall:mall-admin/src/main/java/com/macro/mall/bo/AdminUserDetails.java": [
+25
+],
 "mall:mall-common/src/main/java/com/macro/mall/common/api/CommonPage.java": [
 86,
 90
diff --git a/its/ruling/src/test/resources/expected/mall/java-S2629.json b/its/ruling/src/test/resources/expected/mall/java-S2629.json
index 55057c65b4d..db5cff17ce5 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S2629.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S2629.json
@@ -1,7 +1,4 @@
 {
-"mall:mall-common/src/main/java/com/macro/mall/common/log/WebLogAspect.java": [
-89
-],
 "mall:mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java": [
 151,
 203,
diff --git a/its/ruling/src/test/resources/expected/mall/java-S3242.json b/its/ruling/src/test/resources/expected/mall/java-S3242.json
index 8885c92a30f..c2b6b05d8c4 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S3242.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S3242.json
@@ -1,10 +1,5 @@
 {
 "mall:mall-common/src/main/java/com/macro/mall/common/exception/GlobalExceptionHandler.java": [
 61
-],
-"mall:mall-portal/src/main/java/com/macro/mall/portal/controller/AlipayController.java": [
-39,
-48,
-57
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/mall/java-S4719.json b/its/ruling/src/test/resources/expected/mall/java-S4719.json
index ea36e2fd51d..c682046ef71 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S4719.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S4719.json
@@ -1,6 +1,5 @@
 {
 "mall:mall-admin/src/main/java/com/macro/mall/service/impl/OssServiceImpl.java": [
-72,
-75
+72
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/mall/java-S6204.json b/its/ruling/src/test/resources/expected/mall/java-S6204.json
index 03df599b9a0..d78162e03c7 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S6204.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S6204.json
@@ -1,7 +1,49 @@
 {
+"mall:mall-admin/src/main/java/com/macro/mall/bo/AdminUserDetails.java": [
+33
+],
+"mall:mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java": [
+101
+],
+"mall:mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderServiceImpl.java": [
+55,
+75
+],
+"mall:mall-admin/src/main/java/com/macro/mall/service/impl/PmsProductServiceImpl.java": [
+178,
+180,
+181,
+183,
+192
+],
+"mall:mall-admin/src/main/java/com/macro/mall/service/impl/PmsSkuStockServiceImpl.java": [
+40
+],
 "mall:mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminCacheServiceImpl.java": [
+65,
+77,
 87
 ],
+"mall:mall-admin/src/main/java/com/macro/mall/service/impl/UmsMenuServiceImpl.java": [
+82,
+102
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsCartItemServiceImpl.java": [
+85
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java": [
+379,
+387
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/PmsPortalProductServiceImpl.java": [
+80,
+100,
+140
+],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java": [
+180,
+189
+],
 "mall:mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java": [
 156,
 208
diff --git a/its/ruling/src/test/resources/expected/mall/java-S6212.json b/its/ruling/src/test/resources/expected/mall/java-S6212.json
index 8c0fa98e49f..3bc27e6e6a4 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S6212.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S6212.json
@@ -6,9 +6,7 @@
 "mall:mall-admin/src/main/java/com/macro/mall/controller/MinioController.java": [
 47,
 57,
-58,
 65,
-69,
 76,
 107
 ],
@@ -696,6 +694,9 @@
 21,
 30
 ],
+"mall:mall-portal/src/main/java/com/macro/mall/portal/config/JacksonConfig.java": [
+23
+],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/controller/MemberAttentionController.java": [
 61
 ],
@@ -726,7 +727,8 @@
 165
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberAttentionServiceImpl.java": [
-36
+36,
+45
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberCollectionServiceImpl.java": [
 34
@@ -736,7 +738,6 @@
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java": [
 71,
-88,
 385,
 401,
 440,
@@ -762,7 +763,8 @@
 161,
 195,
 229,
-240
+240,
+243
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/PmsPortalProductServiceImpl.java": [
 86,
@@ -798,15 +800,11 @@
 ],
 "mall:mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java": [
 49,
-67,
 78,
 95,
 100,
-128,
 150,
-165,
 170,
-197,
 202,
 216,
 228,
@@ -814,17 +812,13 @@
 246,
 252,
 260,
-269,
-279
+269
 ],
 "mall:mall-security/src/main/java/com/macro/mall/security/aspect/RedisCacheAspect.java": [
 33,
 34,
 35
 ],
-"mall:mall-security/src/main/java/com/macro/mall/security/component/DynamicAuthorizationManager.java": [
-59
-],
 "mall:mall-security/src/main/java/com/macro/mall/security/component/JwtAuthenticationTokenFilter.java": [
 42,
 46,
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S5854.json b/its/ruling/src/test/resources/expected/regex-examples/java-S5854.json
index d8adee9865d..56ff1300368 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S5854.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S5854.json
@@ -32,6 +32,7 @@
 1863
 ],
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase7.java": [
+965,
 1381,
 1397,
 1419,
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S5857.json b/its/ruling/src/test/resources/expected/regex-examples/java-S5857.json
index fe0e040ce7c..80eb375f7fd 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S5857.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S5857.json
@@ -74,6 +74,7 @@
 1405
 ],
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase7.java": [
+353,
 571,
 571,
 701,
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S5867.json b/its/ruling/src/test/resources/expected/regex-examples/java-S5867.json
index c21be2bcc30..a91a60a5e54 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S5867.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S5867.json
@@ -152,6 +152,7 @@
 819,
 821,
 829,
+831,
 835,
 837,
 857,
@@ -247,6 +248,11 @@
 1335,
 1339,
 1341,
+1345,
+1347,
+1349,
+1351,
+1353,
 1355,
 1357,
 1363,
@@ -2401,6 +2407,7 @@
 249,
 251,
 253,
+257,
 267,
 281,
 283,
@@ -2529,7 +2536,18 @@
 1057,
 1059,
 1063,
+1065,
+1067,
+1071,
+1075,
+1077,
+1079,
+1081,
+1083,
+1089,
+1093,
 1101,
+1103,
 1133,
 1151,
 1153,
@@ -2819,6 +2837,7 @@
 733,
 739,
 775,
+779,
 795,
 801,
 825,
@@ -2855,6 +2874,12 @@
 1003,
 1007,
 1009,
+1011,
+1013,
+1015,
+1017,
+1019,
+1021,
 1031,
 1045,
 1047,
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S5869.json b/its/ruling/src/test/resources/expected/regex-examples/java-S5869.json
index a801edbe4fb..774470a3480 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S5869.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S5869.json
@@ -17,10 +17,6 @@
 979,
 1007,
 1019,
-1065,
-1067,
-1069,
-1071,
 1081,
 1083,
 1085,
@@ -32,8 +28,6 @@
 1151,
 1153,
 1473,
-1701,
-1701,
 1779,
 1779,
 1911
@@ -48,9 +42,6 @@
 465,
 471,
 471,
-491,
-491,
-491,
 599,
 607,
 621,
@@ -67,7 +58,6 @@
 1235,
 1385,
 1387,
-1417,
 1421,
 1445,
 1451,
@@ -82,7 +72,6 @@
 1823,
 1823,
 1827,
-1827,
 1835,
 1845,
 1913,
@@ -100,15 +89,12 @@
 31,
 39,
 41,
-83,
-83,
 449,
 509,
 735,
 889,
 901,
 1115,
-1149,
 1195,
 1283,
 1285,
@@ -121,7 +107,6 @@
 151,
 355,
 371,
-487,
 525,
 557,
 559,
@@ -138,9 +123,7 @@
 769,
 769,
 769,
-1091,
 1163,
-1261,
 1303,
 1315,
 1315,
@@ -168,7 +151,6 @@
 1495,
 1509,
 1517,
-1519,
 1823,
 1833,
 1863,
@@ -178,37 +160,12 @@
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase5.java": [
 45,
 47,
-51,
-51,
-51,
-51,
-51,
 71,
 139,
 215,
 217,
 285,
 415,
-689,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
-699,
 755,
 883,
 883,
@@ -219,9 +176,6 @@
 967,
 1099,
 1099,
-1143,
-1143,
-1143,
 1193,
 1219,
 1225,
@@ -234,7 +188,6 @@
 1557,
 1557,
 1557,
-1595,
 1645,
 1645,
 1759,
@@ -248,13 +201,9 @@
 33,
 33,
 33,
-67,
-67,
-67,
 113,
 209,
 209,
-233,
 395,
 473,
 473,
@@ -263,28 +212,13 @@
 575,
 595,
 613,
-665,
-665,
-665,
-665,
-665,
 781,
 799,
 799,
 803,
-823,
-823,
-823,
-823,
-823,
 869,
 917,
 1003,
-1015,
-1015,
-1017,
-1017,
-1041,
 1055,
 1247,
 1247,
@@ -292,24 +226,14 @@
 1369,
 1407,
 1585,
-1585,
 1589,
 1601,
 1619,
-1741,
-1741,
-1741,
-1741,
 1775,
 1819,
-1895,
-1895,
-1895,
-1895,
 1921
 ],
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase7.java": [
-45,
 61,
 61,
 61,
@@ -324,16 +248,8 @@
 233,
 235,
 271,
-301,
 329,
 593,
-725,
-725,
-725,
-725,
-737,
-759,
-759,
 883,
 967,
 1151,
@@ -341,7 +257,6 @@
 1153,
 1213,
 1221,
-1235,
 1251,
 1331,
 1367,
@@ -373,17 +288,7 @@
 545,
 547,
 547,
-825,
-825,
-825,
-825,
-825,
-825,
-825,
 831,
-869,
-869,
-869,
 911,
 913,
 931,
@@ -391,7 +296,6 @@
 971,
 1283,
 1283,
-1309,
 1557
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S5996.json b/its/ruling/src/test/resources/expected/regex-examples/java-S5996.json
index 72f7ee3c2a6..bd35ce4889c 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S5996.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S5996.json
@@ -4,11 +4,40 @@
 347,
 347,
 347,
+1069,
+1069,
+1069,
+1069,
+1069,
+1071,
+1071,
 1613,
 1613,
 1695,
 1695
 ],
+"regex-examples:src/main/java/org/regex/examples/RegexDatabase3.java": [
+385,
+385,
+385,
+1451,
+1453
+],
+"regex-examples:src/main/java/org/regex/examples/RegexDatabase4.java": [
+155,
+155,
+155,
+155,
+155,
+155,
+155,
+155,
+381,
+509,
+795,
+795,
+927
+],
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase5.java": [
 533,
 533,
@@ -21,6 +50,8 @@
 753,
 753,
 773,
+857,
+857,
 1305,
 1987
 ],
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S6019.json b/its/ruling/src/test/resources/expected/regex-examples/java-S6019.json
index 9fdab1b4df9..f61627fdbf1 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S6019.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S6019.json
@@ -27,7 +27,6 @@
 1603
 ],
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase7.java": [
-353,
 1731,
 1735
 ],
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S6326.json b/its/ruling/src/test/resources/expected/regex-examples/java-S6326.json
index 12ab6f910a2..79f4ab89f91 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S6326.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S6326.json
@@ -35,6 +35,32 @@
 495,
 711,
 711,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
+857,
 1693
 ],
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase7.java": [
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S8786.json b/its/ruling/src/test/resources/expected/regex-examples/java-S8786.json
index 60c1a6d04a8..3ce87b5ec1d 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S8786.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S8786.json
@@ -2,6 +2,7 @@
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase1.java": [
 33,
 49,
+77,
 145,
 195,
 205,
@@ -120,11 +121,13 @@
 473,
 475,
 479,
+489,
 551,
 557,
 717,
 737,
 779,
+795,
 881,
 925,
 953,
@@ -314,7 +317,6 @@
 187,
 189,
 203,
-211,
 213,
 221,
 261,
@@ -325,6 +327,7 @@
 341,
 355,
 357,
+361,
 373,
 385,
 415,
@@ -746,7 +749,6 @@
 965,
 975,
 995,
-1039,
 1191,
 1249,
 1263,
diff --git a/its/ruling/src/test/resources/expected/regex-examples/java-S9353.json b/its/ruling/src/test/resources/expected/regex-examples/java-S9353.json
index e71c3f87d8b..37ccd0c89ed 100644
--- a/its/ruling/src/test/resources/expected/regex-examples/java-S9353.json
+++ b/its/ruling/src/test/resources/expected/regex-examples/java-S9353.json
@@ -1,8 +1,5 @@
 {
 "regex-examples:src/main/java/org/regex/examples/RegexDatabase2.java": [
 457
-],
-"regex-examples:src/main/java/org/regex/examples/RegexDatabase8.java": [
-1129
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1105.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1105.json
new file mode 100644
index 00000000000..356473bfd1c
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1105.json
@@ -0,0 +1,30 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java": [
+63
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java": [
+59
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java": [
+99
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java": [
+187
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/BackendCleanup.java": [
+81,
+112
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java": [
+126
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java": [
+74
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java": [
+70
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java": [
+137
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1128.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1128.json
index 75ff2982239..98b53bf564f 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1128.json
@@ -1,25 +1,121 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java": [
+26
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java": [
+34,
+35,
+36,
+37,
+38
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/notification/DefaultNotificationManager.java": [
 24
 ],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsData.java": [
+33
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesData.java": [
+29
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/qualitygate/QualityGates.java": [
 47
 ],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/SearchData.java": [
+30
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/RuleUpdate.java": [
+33,
+34
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java": [
 29
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java": [
+22
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java": [
+22,
+23
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java": [
+22
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java": [
+22
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java": [
+22,
+24
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java": [
+24
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java": [
+22,
+24
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java": [
+22
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java": [
+22,
+23
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java": [
+31
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java": [
+33
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java": [
+35
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java": [
+27
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java": [
+31
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java": [
+30
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java": [
+29
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java": [
+34
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java": [
+22
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java": [
+31
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java": [
+27
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java": [
+22
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java": [
 24
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/SecurityServletFilterTest.java": [
 29
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java": [
+33
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java": [
 45
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java": [
 45
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java": [
+32
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/DatabaseSettingsEnablerTest.java": [
 26,
 27,
@@ -41,9 +137,15 @@
 30,
 36
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/source/ws/LinesActionTest.java": [
+28
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java": [
 37
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/ws/WebServiceFilterTest.java": [
+42
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/WsTester.java": [
 23
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1130.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1130.json
index d6a35022a8b..26a13489bcc 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1130.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1130.json
@@ -1,43 +1,110 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/app/TomcatContexts.java": [
+122
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImpl.java": [
+104
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java": [
+143
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java": [
+162
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java": [
+135
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/index/PermissionIndexerDao.java": [
+220,
+229,
+236
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/BackendCleanup.java": [
+129,
+157,
+177,
+186,
+198,
+217,
+229
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java": [
+113
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/web/RegisterServletFilters.java": [
+40
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/plugins/PluginDownloader.java": [
+141,
+141
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java": [
+213
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/source/CharactersReader.java": [
+43
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/source/index/FileSourcesUpdaterHelper.java": [
+50
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/startup/GeneratePluginIndex.java": [
+52
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/user/UserSessionFilter.java": [
+84,
+84
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java": [
+35
+],
 "sonarqube-6.5:src/test/java/org/sonar/ce/http/CeHttpClientTest.java": [
 64,
-71,
 84
 ],
 "sonarqube-6.5:src/test/java/org/sonar/ce/log/CeLoggingTest.java": [
+45,
 50
 ],
+"sonarqube-6.5:src/test/java/org/sonar/ce/log/CeProcessLoggingTest.java": [
+66
+],
 "sonarqube-6.5:src/test/java/org/sonar/ce/queue/CeQueueImplTest.java": [
-131,
 146,
-158,
 177
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java": [
+43
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java": [
 46,
 56,
+67,
 81,
+92,
 106,
-117
+117,
+127
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/app/TomcatConnectorsTest.java": [
-131
+"sonarqube-6.5:src/test/java/org/sonar/server/app/ProgrammaticLogbackValveTest.java": [
+33
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/app/TomcatAccessLogTest.java": [
+48
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/app/TomcatContextsTest.java": [
+58,
+87
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java": [
+70
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java": [
 81,
-91,
-100
+91
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java": [
-81,
-92,
 104,
-111,
-120,
-132,
-141,
-154,
-168
+111
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/CookiesTest.java": [
 44,
@@ -51,14 +118,6 @@
 110,
 116
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java": [
-69,
-82,
-99,
-112,
-128,
-145
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java": [
 52,
 60,
@@ -68,61 +127,30 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/InitFilterTest.java": [
 81,
-88
+88,
+93,
+105,
+116
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java": [
 57,
-62,
 71,
-79,
-89,
-99,
-109,
-120,
-131,
 142,
-150,
-156,
-164
+150
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java": [
-90,
-100,
-112,
-123,
-135,
 151,
 161,
 171,
-181,
-193,
-207,
 221,
 234,
 245,
 254,
-262,
-272,
-284,
-299
+262
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/JwtSerializerTest.java": [
-60,
-70,
-85,
-100,
-112,
-129,
-144,
-160,
-178,
-196,
-214,
-231,
 241,
 250,
-281,
-293,
 301,
 309
 ],
@@ -131,136 +159,86 @@
 80
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java": [
-88,
 99,
-110,
 128,
-139,
-150,
-181
+139
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java": [
-58,
-64,
-74,
-90,
-100,
-110,
-120
+58
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java": [
 87,
-92,
-114,
-135,
-151,
-166,
-182,
-196,
-210,
-226,
-242,
 259,
 265,
 275
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java": [
 119,
-127,
-140,
-152,
-167,
-180,
-196,
 209,
-224,
-240,
 255,
-272,
-286,
-302,
-318,
 330,
-342,
-352
+342
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java": [
 85,
-93,
-125,
-137,
-152,
-165,
-177,
-198,
-212
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java": [
-56
+93
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java": [
 81,
-88
+88,
+108,
+156,
+156
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java": [
-65
+65,
+118,
+118
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/ws/ValidateActionTest.java": [
+59
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/batch/BatchIndexTest.java": [
+51
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/FileActionTest.java": [
+55,
+63,
+74,
 84,
 91
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/IndexActionTest.java": [
+54,
+62,
 72,
 78
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/IssuesActionTest.java": [
-86,
-124,
-161,
-197,
-233,
-269,
 296
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/ProjectActionTest.java": [
-48,
-73
+48
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/ProjectDataLoaderTest.java": [
 61
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java": [
-239,
-271
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/CeWsTest.java": [
-34
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java": [
 130
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/TaskActionTest.java": [
-72,
 98,
 209
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java": [
-78,
-109,
-142
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java": [
 95,
 108,
 121
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ComponentUpdaterTest.java": [
-69,
 98,
 112,
 126,
-140,
-153,
 171,
 184,
 197,
@@ -268,9 +246,7 @@
 229
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/AppActionTest.java": [
-81,
-91,
-109
+81
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/FilterParserTest.java": [
 45,
@@ -289,33 +265,8 @@
 195
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java": [
-55,
-70,
-79,
-88,
-97,
-105,
-113,
-121,
-130,
-139,
-147,
-155,
-164,
-173,
-181,
-189,
-198,
-207,
-216,
-233,
-241,
 249,
 256,
-263,
-277,
-288,
-297,
 308
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java": [
@@ -358,15 +309,9 @@
 216
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/SearchActionTest.java": [
-124,
-135,
-148,
-162,
-174,
 189
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java": [
-909,
 923,
 938,
 954,
@@ -375,49 +320,13 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/ShowActionTest.java": [
 69,
 98,
-111,
-147,
-161,
-173,
-187,
-202,
-218,
-228,
-238,
-247
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java": [
-160,
-185,
-209,
-225,
-250,
-266,
-292,
-310,
-340,
-373,
-398,
-414,
-424,
-443,
-462,
-487,
-511,
-533,
-556,
-572
+111
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/TreeActionTest.java": [
-108,
-138,
-168,
-186,
-210
+391
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java": [
-89,
-139
+89
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java": [
 38,
@@ -434,37 +343,15 @@
 250
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java": [
-35,
-43,
-52,
-61,
-70,
-78,
-86,
-94,
-102,
-118
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java": [
-101,
-107,
-118,
-129,
-137,
-146,
-156,
-165,
-174,
-183,
-193,
-203,
-213,
-223,
-233,
-242,
-253
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java": [
+94
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java": [
+137,
+174,
+233,
+242
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java": [
 35,
 48,
 61,
@@ -474,9 +361,7 @@
 100,
 110,
 120,
-130,
-140,
-167
+130
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java": [
 35,
@@ -490,20 +375,10 @@
 95,
 101,
 110,
-118,
 126
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java": [
-93
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java": [
-41,
-137
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilderTest.java": [
-493,
-500,
-507
+41
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java": [
 34,
@@ -514,29 +389,18 @@
 75
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java": [
-56,
-88,
 123
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java": [
-55,
-87,
 106
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java": [
-45,
-56,
-67,
-78,
 89,
 102
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java": [
-275,
-305
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java": [
-237
+237,
+500
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java": [
 65
@@ -544,25 +408,10 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java": [
 57
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java": [
-95,
-116,
-153,
-174,
-197
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java": [
 58
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java": [
-95,
-117,
-135,
-167,
-190
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java": [
-64,
 85,
 96,
 105,
@@ -588,14 +437,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java": [
 58
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java": [
-131,
-156,
-191,
-211,
-229,
-247
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java": [
 58,
 67,
@@ -605,67 +446,22 @@
 112,
 124,
 138,
-161,
-177
+161
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java": [
 62,
-76,
-85,
-145,
 165
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java": [
-45,
 54
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java": [
-59
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java": [
-68
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java": [
-45,
-62
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java": [
-52
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java": [
 73,
-86,
-94,
-127,
-146,
-162,
-178
+86
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java": [
-42,
-56,
 69
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java": [
-38,
-46,
-55,
-64
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java": [
-67,
-77
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java": [
-68,
-81,
-91
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java": [
-69,
-83,
-94
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java": [
 73,
 82,
@@ -698,19 +494,12 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java": [
 119,
 146,
-167,
 190
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java": [
-47,
 56,
 65
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java": [
-288,
-297,
-306
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java": [
 62
 ],
@@ -739,10 +528,6 @@
 294,
 309
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java": [
-71,
-80
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java": [
 126,
 146,
@@ -754,10 +539,7 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java": [
 45,
-52,
-62,
-72,
-80
+72
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java": [
 34,
@@ -770,14 +552,8 @@
 108
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java": [
-49,
-68,
-83,
 100,
-108,
-119,
-133,
-147
+108
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java": [
 37,
@@ -795,20 +571,12 @@
 72,
 80,
 88,
-97,
-106
+97
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java": [
-92,
-113,
-126,
-138,
-152,
 167,
 173,
-182,
-221,
-235
+182
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java": [
 186,
@@ -818,13 +586,9 @@
 82
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java": [
-48,
-55,
 62,
 72,
-82,
-93,
-101
+93
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java": [
 274,
@@ -833,57 +597,23 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java": [
 107,
-112,
-125,
-135
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java": [
-163,
-170,
-177,
-184,
-191,
-198,
-207,
-216,
-225,
-232
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java": [
-74,
-90,
-109
+125
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java": [
-65
+65,
+90
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java": [
 110,
-125,
-175,
 263,
 298,
 310
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java": [
-60,
-69,
-78,
-98,
-118,
-128,
-138,
-148,
-157,
-165,
-173,
-183,
-193
+165
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java": [
-53,
-80,
-94
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java": [
+85
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java": [
 78,
@@ -892,12 +622,6 @@
 121,
 131
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java": [
-35
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java": [
-81
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java": [
 116,
 121,
@@ -914,13 +638,6 @@
 38,
 53
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java": [
-176,
-256
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java": [
-70
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java": [
 275,
 300,
@@ -930,21 +647,13 @@
 400,
 421
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java": [
-72
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java": [
-108,
-125,
-143
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java": [
+85
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java": [
 108,
 129
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java": [
-80
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java": [
 115,
 120,
@@ -957,9 +666,6 @@
 183,
 188
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java": [
-67
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java": [
 203,
 224,
@@ -969,10 +675,14 @@
 311,
 331
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java": [
+95
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java": [
 98,
 137,
-152
+152,
+166
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPayloadFactoryImplTest.java": [
 55
@@ -980,6 +690,15 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java": [
 53
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java": [
+79
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java": [
+236
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java": [
+230
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java": [
 82,
 98,
@@ -993,26 +712,25 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/BulkIndexerTest.java": [
 97
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/EsClientProviderTest.java": [
-59,
-77,
-98,
-110,
-122
+"sonarqube-6.5:src/test/java/org/sonar/server/es/EsServerHolder.java": [
+94
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/es/IndexCreatorTest.java": [
+101,
+106
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java": [
-48,
 67
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/SortingTest.java": [
-40
+"sonarqube-6.5:src/test/java/org/sonar/server/es/RecoveryIndexerTest.java": [
+204,
+220
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java": [
-37,
-62,
-71,
-79,
-87
+"sonarqube-6.5:src/test/java/org/sonar/server/es/SortingTest.java": [
+153,
+158,
+162,
+166
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java": [
 42,
@@ -1047,9 +765,7 @@
 131
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/IssueUpdaterTest.java": [
-90,
-102,
-127
+90
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ResultTest.java": [
 28,
@@ -1075,14 +791,21 @@
 208,
 252
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java": [
-65
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest.java": [
+54,
+73,
+92,
+111,
+128
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java": [
-43
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java": [
+179
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java": [
+105,
+120
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/workflow/TransitionTest.java": [
-40,
 57,
 127,
 140,
@@ -1090,7 +813,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java": [
 105,
-110,
 134,
 142,
 150,
@@ -1099,11 +821,6 @@
 173
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/AssignActionTest.java": [
-94,
-109,
-123,
-137,
-150,
 164,
 180,
 192,
@@ -1119,48 +836,23 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java": [
 122,
-134,
 150,
 166,
 182,
 198,
-215,
-241,
-263,
-283,
-305,
-327,
-347,
-371,
 397,
 423,
-436,
 448,
 455
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java": [
 72,
-78,
-95,
-114,
-127,
-142,
-157,
-172,
-186,
-199,
-212,
-226,
 258
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java": [
-76,
-84,
-108
+76
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java": [
-71,
-84,
 97,
 108,
 119,
@@ -1170,7 +862,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java": [
 116,
-123,
 136,
 144,
 152,
@@ -1180,8 +871,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java": [
 77,
-82,
-98,
 114,
 125,
 136,
@@ -1192,27 +881,49 @@
 176
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java": [
-139
+109,
+166,
+197,
+225,
+254,
+278,
+333,
+355,
+387,
+436,
+461,
+480,
+499,
+519,
+540
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java": [
+113,
+224,
+247,
+272,
+316,
+332,
+357,
+383,
+410,
+423,
+468,
+499,
+544,
+636,
+644,
+670
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java": [
-100,
-115,
 139,
 145,
 154
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java": [
-165,
 190,
 197
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java": [
-101,
-114,
-138,
-144,
-155
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/TagsActionTest.java": [
 82,
 94,
@@ -1223,61 +934,151 @@
 169,
 176
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/language/ws/LanguageWsTest.java": [
+81,
+96,
+110
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/license/ws/ListActionTest.java": [
-77,
-103,
-127,
-152,
-169,
-186,
-199,
-213,
-228,
-245,
 256
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java": [
+106,
+126,
+141,
+155,
+170,
+184,
+198,
+213,
+242,
+259,
+281,
+305,
+316,
+328,
+342,
+355,
+368,
+380,
+394,
+406,
+425,
+438
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java": [
+65,
+76,
+83,
+93
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java": [
-72
+127,
+192,
+208
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java": [
+93,
+117,
+133,
+149,
+165,
+182,
+199,
+212,
+221,
+232,
+239,
+247
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java": [
+91,
+117,
+172,
+197,
+225,
+236,
+298,
+308
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java": [
 415,
 424,
 433,
 442,
-460,
 546,
 695,
 849,
 1007,
-1098,
 1211
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java": [
-123,
-135,
 178
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java": [
 41,
-48,
-57,
-66,
 75,
 82,
+87
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/measure/ws/SearchActionTest.java": [
+90
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/metric/ws/CreateActionTest.java": [
+73,
+94,
+111,
+153,
+169,
+204,
+213,
+222,
+231,
+245,
+259,
+270,
+281
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java": [
+60
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/metric/ws/SearchActionTest.java": [
+53,
+62,
+75,
 87,
+99,
+112
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/metric/ws/TypesActionTest.java": [
+39
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java": [
 95,
-103
+115,
+129,
+142,
+149,
+157,
+178,
+185,
+195,
+205
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/measure/ws/SearchActionTest.java": [
-90,
-109,
-127,
-151,
-179,
-196
+"sonarqube-6.5:src/test/java/org/sonar/server/organization/DefaultOrganizationProviderImplTest.java": [
+132
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java": [
-370,
+121,
+157,
+167,
+175,
+185,
+204,
+214,
+243,
+265,
+277,
 384,
 396,
 423,
@@ -1299,10 +1100,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java": [
 318
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/SearchActionTest.java": [
-103,
-103
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java": [
 60
 ],
@@ -1318,172 +1115,26 @@
 151
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java": [
-66,
-79,
-94,
-107,
-123,
-139,
-156,
-169,
-176,
-183,
-190,
-221,
-238,
-251,
-263,
-275,
-287,
-302,
-319,
-333,
-351,
 449
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java": [
-68,
-80,
-95,
-112,
-127,
-142,
-155,
-162,
-169,
-176,
-196,
-208,
-222,
-235,
-246,
-257,
-273,
-285,
-302,
-333
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java": [
-77,
-116,
-127,
-142,
-156,
-181,
-204,
-223,
-240,
-259,
-269,
-279
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java": [
-70,
-84,
-98,
-116,
-134,
-164,
-188,
-195,
-202,
-209,
-229,
-241,
-253,
-266,
 281,
-288,
-297,
-309,
-326
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java": [
-75,
-89,
-103,
-119,
-135,
-151,
-164,
-176,
-183,
-190,
-197,
-217,
-230,
-241,
-252,
-268,
-280,
-297
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java": [
-61,
-92,
-118,
-128,
-138,
-150,
-159
+288
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java": [
-123,
 162,
-171,
-183,
-201,
-214,
-229,
-244,
-260,
-269,
 278
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/UsersActionTest.java": [
-60,
-77,
-87,
-117,
-140,
-164,
-184,
-204,
-220,
-232,
-292,
-304,
-315,
-326,
-341
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java": [
-74,
-87,
 193
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java": [
-59,
-71,
-95,
-107,
-119
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java": [
-73,
-86,
-178,
-192,
 211
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java": [
-109,
 195
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/BulkApplyTemplateActionTest.java": [
-115,
-203,
-213,
 222,
 230,
 238
@@ -1504,55 +1155,14 @@
 175
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/RemoveProjectCreatorFromTemplateActionTest.java": [
-60,
-83,
-93,
-103,
-113,
-125
+83
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java": [
-73,
 190
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java": [
-173
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java": [
-84,
 174
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java": [
-60,
-107,
-140,
-171,
-195,
-216,
-235,
-256,
-273,
-286,
-299,
-313,
-324,
-336
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java": [
-58,
-73,
-100,
-125,
-148,
-174,
-193,
-208,
-219,
-229,
-239,
-251,
-261
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java": [
 200
 ],
@@ -1565,12 +1175,16 @@
 39
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java": [
+42,
 121
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ServerImplTest.java": [
-74,
-82,
-89
+63,
+74
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/TempFolderProviderTest.java": [
+45,
+58
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/UrlSettingsTest.java": [
 61,
@@ -1579,57 +1193,188 @@
 80
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java": [
-68
+68,
+93,
+103,
+115,
+146
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java": [
 48
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java": [
+77
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java": [
+53
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java": [
 43
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/monitoring/SonarQubeMonitorTest.java": [
 67,
+123,
 133,
 139,
-149,
-157,
-176
+149
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/platformlevel/PlatformLevel2Test.java": [
+45
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/RedirectFilterTest.java": [
 47
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/web/RootFilterTest.java": [
+52
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java": [
+60,
+121,
 125
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java": [
-51
+51,
+103,
+103
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/DbMigrationStatusActionTest.java": [
+92,
+102,
+113,
+125,
+135,
+146,
+157,
+170,
+184,
+198,
+211
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/IndexActionTest.java": [
-63,
-76,
-96,
-116,
 130
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/InfoActionTest.java": [
 55
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/RestartActionTest.java": [
-110,
-120
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/LogsActionTest.java": [
+161
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/MigrateDbActionTest.java": [
+95,
+106,
+116,
+127,
+136,
+147,
+158,
+171,
+185,
+199
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/ServerWsTest.java": [
+48,
 55
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/project/ws/CreateActionTest.java": [
-95,
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/StatusActionTest.java": [
+102,
+177,
+193,
+214,
+224
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java": [
+121,
+128,
+137
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java": [
+102,
+165,
+239,
+254,
+267
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java": [
+43
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java": [
+68,
+388
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java": [
+90,
+97
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java": [
+73,
+81
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java": [
+75,
+83,
+118,
+126,
+135
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java": [
+87,
+94,
+103,
+111,
+121,
+132,
+175,
+227,
+254
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java": [
+83,
+90,
+99,
 112,
 127,
+158,
+187,
+209,
+246,
+278
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java": [
+58,
+66,
+101,
+110
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java": [
+77,
+85,
+120,
+129,
+139
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java": [
+105,
+112
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java": [
+76,
+91,
+106,
+120,
+135,
+150,
+161,
+174
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/project/ws/CreateActionTest.java": [
 239,
 267,
 275,
 283
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/project/ws/DeleteActionTest.java": [
+152
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/project/ws/GhostsActionTest.java": [
 82,
 114,
@@ -1659,14 +1404,6 @@
 197
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/project/ws/SearchActionTest.java": [
-90,
-126,
-138,
-155,
-167,
-179,
-193,
-208,
 222,
 230,
 237,
@@ -1691,7 +1428,6 @@
 83,
 92,
 109,
-118,
 133,
 141,
 152,
@@ -1704,11 +1440,9 @@
 229,
 241,
 250,
-264,
 280,
 298,
 314,
-330,
 347,
 363,
 380,
@@ -1718,11 +1452,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java": [
 73,
-80,
-90,
-109,
-127,
-145,
 164,
 179,
 228
@@ -1742,18 +1471,7 @@
 60,
 68
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java": [
-64,
-86,
-105,
-119,
-134,
-149,
-164,
-173
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java": [
-60,
 73,
 83
 ],
@@ -1777,6 +1495,21 @@
 161,
 172
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java": [
+198,
+206,
+231,
+238,
+243,
+248,
+258,
+270,
+278,
+292,
+307,
+312,
+317
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/SelectActionTest.java": [
 70,
 80,
@@ -1801,16 +1534,10 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java": [
 43
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java": [
-55,
-73,
-91,
-109,
-128
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java": [
 185,
-198
+198,
+210
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java": [
 151,
@@ -1827,10 +1554,7 @@
 155
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java": [
-153,
-180,
 211,
-236,
 298,
 344,
 361,
@@ -1845,10 +1569,16 @@
 149,
 163
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java": [
+86,
+129,
+145,
+161,
+168,
+175,
+184
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java": [
-96,
-130,
-158,
 240,
 253
 ],
@@ -1876,6 +1606,27 @@
 212,
 226
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java": [
+101,
+130,
+145,
+162,
+177,
+184,
+201
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java": [
+108,
+130,
+157,
+184,
+208,
+228,
+275,
+298,
+322,
+386
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java": [
 125
 ],
@@ -1888,8 +1639,6 @@
 205
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java": [
-91,
-112,
 135,
 147,
 157,
@@ -1918,13 +1667,6 @@
 320,
 355
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/rule/RuleCreatorTest.java": [
-447
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java": [
-51,
-66
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java": [
 40
 ],
@@ -1936,7 +1678,6 @@
 213
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java": [
-73,
 100,
 112
 ],
@@ -1944,6 +1685,11 @@
 44,
 50
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/RepositoriesActionTest.java": [
+55,
+62,
+69
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java": [
 92,
 118,
@@ -1956,29 +1702,12 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/SearchActionTest.java": [
 224,
-240,
-260,
-276,
-288,
-300,
-317,
-360,
-380,
-415,
-451,
-486,
-510,
-534,
-559,
-676,
-697,
-730
+240
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/ShowActionTest.java": [
 97,
 107,
 119,
-133,
 176,
 205
 ],
@@ -1990,38 +1719,26 @@
 106,
 157,
 177,
-205,
-248,
 314,
 323,
 330
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java": [
-64,
-81,
-96,
-109,
-123,
 137
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java": [
+110,
+254
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java": [
+55
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java": [
+59,
 98
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java": [
 92,
-166,
-179,
-196,
-227,
-265,
-279,
-293,
-303,
-316,
-329,
-343,
-357,
-370,
 383
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/ResetActionTest.java": [
@@ -2047,13 +1764,7 @@
 60
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java": [
-65,
-78,
-87,
-112,
-127,
-137,
-163
+137
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java": [
 68,
@@ -2061,50 +1772,14 @@
 87,
 101,
 110,
-121,
-144,
-167,
 185,
 193
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java": [
 97,
-103,
-120,
-146,
-160,
-180,
-201,
-215,
-229,
-245,
-262,
-275,
-288,
-300,
-314,
-330,
-353,
 369,
 387,
-405,
-428,
 453,
-466,
-483,
-501,
-518,
-539,
-560,
-585,
-597,
-615,
-636,
-646,
-664,
-681,
-698,
-715,
 728,
 738
 ],
@@ -2114,52 +1789,95 @@
 50
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/source/SourceServiceTest.java": [
-64,
+55,
 75,
 83,
 111,
 118
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/source/index/FileSourceTesting.java": [
+42,
 53,
 76
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/source/ws/HashActionTest.java": [
+61,
+70,
+79,
+99
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/source/ws/IndexActionTest.java": [
 98,
 119,
 130
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/source/ws/LinesActionTest.java": [
+124,
+133,
+142,
+151,
 256
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/source/ws/RawActionTest.java": [
+80,
+96
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/source/ws/ShowActionTest.java": [
+99,
+134
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java": [
+58
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java": [
 51,
 67,
 83,
 96
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java": [
+70
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java": [
+35
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/test/db/TestTesting.java": [
-61,
-82
+48
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/test/index/TestIndexTest.java": [
-42,
-55,
-68,
+"sonarqube-6.5:src/test/java/org/sonar/server/test/index/TestIndexerTest.java": [
 81,
-99,
-126
+181
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java": [
+90,
+118,
+152,
+182
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/test/ws/ListActionTest.java": [
 84,
 197,
 205,
+213,
+223,
+232,
+241,
 250,
 256,
 262,
 268,
 274
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java": [
+88,
+110,
+254,
+299,
+350
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/tester/ServerTester.java": [
+182
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java": [
 115,
 136,
@@ -2211,7 +1929,13 @@
 50
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java": [
-102
+61,
+68,
+78,
+93,
+102,
+111,
+123
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/DefaultUserTest.java": [
 29
@@ -2236,17 +1960,20 @@
 168,
 187
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java": [
+76,
+87,
+99,
+115,
+132,
+144,
+157
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ws/CreateActionTest.java": [
-98,
 129,
 136,
-143,
 159,
 175,
-190,
-205,
-219,
-233,
 251,
 264,
 277,
@@ -2257,16 +1984,6 @@
 318
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ws/GroupsActionTest.java": [
-72,
-82,
-98,
-112,
-126,
-140,
-151,
-171,
-184,
-200,
 221,
 234,
 244,
@@ -2279,8 +1996,27 @@
 65
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ws/SearchActionTest.java": [
+74,
+107,
+214,
+231,
+249,
+265,
 283
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/user/ws/UpdateActionTest.java": [
+85,
+95,
+108,
+119,
+130,
+144,
+157,
+171,
+184,
+198,
+212
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java": [
 45,
 58
@@ -2307,6 +2043,20 @@
 294,
 311
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java": [
+60,
+80,
+104,
+123,
+135,
+150,
+158,
+166,
+174,
+187,
+202,
+225
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java": [
 65,
 79,
@@ -2314,7 +2064,6 @@
 107,
 123,
 138,
-154,
 170,
 188,
 202,
@@ -2332,17 +2081,9 @@
 176,
 189,
 203,
-220,
 239
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java": [
-68,
-87,
-106,
-123,
-150,
-167,
-181,
 191,
 202
 ],
@@ -2367,14 +2108,15 @@
 71,
 83,
 97,
-115,
-139,
-165,
-189,
-205,
-235,
-258,
-298
+189
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/util/ObjectInputStreamIteratorTest.java": [
+36,
+58
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java": [
+82,
+82
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/view/index/ViewIndexTest.java": [
 41,
@@ -2397,44 +2139,61 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java": [
 58,
-63
+63,
+75,
+86,
+97,
+109,
+122,
+135,
+149,
+163,
+179,
+195,
+209,
+224,
+238,
+253
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/ServletRequestTest.java": [
 56,
 64,
 71,
+120,
+133,
 145,
 152,
 174
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/ServletResponseTest.java": [
-54,
-59,
-66,
-73,
-80,
-85,
-92,
-98
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/ws/WebServiceEngineTest.java": [
-308
+49,
+92
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/WebServiceFilterTest.java": [
+59,
 65,
 78,
-86,
 93
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java": [
 54,
-59
+59,
+66,
+76,
+76
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/WsTester.java": [
+143,
 255
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/WsUtilsTest.java": [
 44,
+59,
 72
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/ws/ws/WebServicesWsTest.java": [
+58,
+67,
+76
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1144.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1144.json
index faa02974e6a..151580828e7 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1144.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1144.json
@@ -1,16 +1,156 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java": [
+124
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ce/ws/TaskAction.java": [
+153
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ComponentFinder.java": [
+162
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java": [
+57
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/FilterParser.java": [
+186
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/SuggestionCategory.java": [
+37
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java": [
+110
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java": [
+78
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java": [
+36
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java": [
+155
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java": [
+48
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java": [
+73
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java": [
+39
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java": [
+147
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java": [
+68
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java": [
+66
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java": [
+128
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java": [
+84,
+92
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java": [
+73
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java": [
+316,
+333,
+348,
+408
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java": [
+75
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java": [
+77
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java": [
+110
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java": [
+83
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java": [
+101
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java": [
+289
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/EsUtils.java": [
+132,
+174
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
+124
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/Result.java": [
+40
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java": [
+75
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java": [
+56
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java": [
+104
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/project/Visibility.java": [
+38
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java": [
+138
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java": [
+146
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/RuleUpdate.java": [
+255
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/TaskActionTest.java": [
+352
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java": [
+70
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java": [
+36
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java": [
+364
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java": [
+268
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java": [
+44
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java": [
 153
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java": [
+247
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java": [
 175
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java": [
-288
+"sonarqube-6.5:src/test/java/org/sonar/server/notification/NotificationDaemonTest.java": [
+251
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java": [
 143
 ],
+"sonarqube-6.5:src/test/java/org/sonar/server/projectanalysis/ws/SearchActionTest.java": [
+352
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java": [
+304
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java": [
 170
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1166.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1166.json
index f6b31ae3321..8f6638749eb 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1166.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1166.json
@@ -2,19 +2,8 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/authentication/BasicAuthenticator.java": [
 90
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/authentication/InitFilter.java": [
-95,
-107
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/authentication/JwtSerializer.java": [
-114,
-116
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java": [
-91
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/authentication/SsoAuthenticator.java": [
-119
+114
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/authentication/ws/LoginAction.java": [
 110
@@ -44,6 +33,7 @@
 114
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java": [
+46,
 59
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/project/ws/ProjectsWsSupport.java": [
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1450.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1450.json
new file mode 100644
index 00000000000..a657790a1fc
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1450.json
@@ -0,0 +1,5 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/notification/DefaultNotificationManager.java": [
+53
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1612.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1612.json
index 9b625db50c5..fecd5d2aa58 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1612.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1612.json
@@ -4,14 +4,5 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java": [
 528
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java": [
-107
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/UpdateActionTest.java": [
-79
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/AppActionTest.java": [
-72
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1698.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1698.json
new file mode 100644
index 00000000000..19f6dc6a9c1
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1698.json
@@ -0,0 +1,6 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/RegisterRules.java": [
+263,
+478
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1699.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1699.json
index 312ba818f7d..92398c573a7 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1699.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1699.json
@@ -2,9 +2,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java": [
 44
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java": [
-292
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java": [
 44,
 50
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2118.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2118.json
new file mode 100644
index 00000000000..75e0a80937c
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2118.json
@@ -0,0 +1,5 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/util/cache/DiskCache.java": [
+96
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2175.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2175.json
new file mode 100644
index 00000000000..32f85a7da1f
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2175.json
@@ -0,0 +1,5 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/AppAction.java": [
+185
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2184.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2184.json
new file mode 100644
index 00000000000..4574fe15d16
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2184.json
@@ -0,0 +1,15 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java": [
+134
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java": [
+138,
+140
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java": [
+115
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/source/SourceService.java": [
+72
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2187.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2187.json
index 9129ec44c02..e6b51799f70 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2187.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2187.json
@@ -1,4 +1,10 @@
 {
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java": [
+26
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java": [
+26
+],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java": [
 22
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2209.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2209.json
new file mode 100644
index 00000000000..f7b1526ace8
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2209.json
@@ -0,0 +1,5 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/es/EsUtils.java": [
+91
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2221.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2221.json
index be5e67dc1e0..fae9a9c7350 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2221.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2221.json
@@ -8,18 +8,9 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/authentication/BasicAuthenticator.java": [
 90
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/authentication/InitFilter.java": [
-87
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/authentication/JwtSerializer.java": [
 116
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java": [
-82
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/authentication/RealmAuthenticator.java": [
-114
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/component/ws/FilterParser.java": [
 68
 ],
@@ -109,9 +100,6 @@
 68,
 84
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/platform/BackendCleanup.java": [
-100
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/platform/Platform.java": [
 290
 ],
@@ -136,9 +124,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java": [
 61
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java": [
-73
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/plugins/UpdateCenterClient.java": [
 115
 ],
@@ -152,12 +137,12 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/util/ObjectInputStreamIterator.java": [
 45
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/view/index/ViewIndexer.java": [
-127
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/ws/ServletRequest.java": [
 101
 ],
+"sonarqube-6.5:src/main/java/org/sonar/server/ws/WebServiceEngine.java": [
+110
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/ws/WsUtils.java": [
 59
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2325.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2325.json
index 48a0b2e235e..544402bb9f7 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2325.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2325.json
@@ -6,12 +6,12 @@
 68,
 76
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java": [
-66
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java": [
 36
 ],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java": [
+140
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/IndexDefinitionHash.java": [
 86
 ],
@@ -22,28 +22,19 @@
 155
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/SearchAction.java": [
-421,
 433
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java": [
-122,
-354
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java": [
-85
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/index/PermissionIndexer.java": [
+139
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/platform/web/PlatformServletContextListener.java": [
 56
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java": [
-50
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java": [
 80
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/rule/RegisterRules.java": [
 199,
-279,
 307,
 375
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2384.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2384.json
index 2f608f7fa81..7e417f005ea 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2384.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2384.json
@@ -26,11 +26,6 @@
 32,
 41
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/component/index/ComponentIndexQuery.java": [
-50,
-58,
-74
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/component/ws/ComponentsWs.java": [
 32
 ],
@@ -50,17 +45,11 @@
 33,
 39
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java": [
-46
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java": [
 33,
 34,
 35
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java": [
-51
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java": [
 47
 ],
@@ -347,9 +336,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/plugins/ws/PluginsWs.java": [
 31
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/project/Visibility.java": [
-68
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/project/ws/ProjectsWs.java": [
 32
 ],
@@ -363,8 +349,7 @@
 29
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/projectanalysis/ws/SearchData.java": [
-91,
-108
+91
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/projectlink/ws/ProjectLinksWs.java": [
 29
@@ -419,8 +404,7 @@
 186
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java": [
-155,
-193
+155
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java": [
 73
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2629.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2629.json
new file mode 100644
index 00000000000..1b3f963888e
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2629.json
@@ -0,0 +1,5 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java": [
+184
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2698.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2698.json
index c2cf85b84b6..cc5620cfbef 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2698.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2698.json
@@ -222,11 +222,8 @@
 171,
 172,
 173,
-189,
 190,
-194,
 195,
-199,
 201
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java": [
@@ -297,9 +294,7 @@
 164,
 165,
 166,
-196,
 197,
-201,
 203
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java": [
@@ -361,8 +356,6 @@
 109,
 110,
 111,
-163,
-173,
 189,
 190,
 191,
@@ -395,8 +388,7 @@
 261
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java": [
-356,
-358
+356
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java": [
 52,
@@ -496,18 +488,11 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/IssuesActionTest.java": [
 107,
 108,
-109,
 110,
 111,
-112,
-113,
-114,
 115,
 116,
 117,
-118,
-119,
-120,
 145,
 146,
 147,
@@ -518,7 +503,6 @@
 152,
 153,
 154,
-155,
 156,
 157,
 181,
@@ -531,7 +515,6 @@
 188,
 189,
 190,
-191,
 192,
 193,
 217,
@@ -544,12 +527,10 @@
 224,
 225,
 226,
-227,
 228,
 229,
 253,
 254,
-255,
 256,
 257,
 258,
@@ -557,7 +538,6 @@
 260,
 261,
 262,
-263,
 264,
 265,
 290,
@@ -566,8 +546,7 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/ProjectActionTest.java": [
 64,
 65,
-66,
-83
+66
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java": [
 106,
@@ -638,8 +617,6 @@
 222,
 223,
 224,
-254,
-267,
 281,
 282,
 293,
@@ -799,9 +776,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/component/NewComponentTest.java": [
 139
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/component/index/ComponentIndexCombinationTest.java": [
-36
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/index/ComponentIndexHighlightTest.java": [
 71
 ],
@@ -859,10 +833,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java": [
 64,
 101,
-126,
-135,
-160,
-169,
 194,
 203,
 229,
@@ -897,11 +867,6 @@
 118,
 119,
 120,
-131,
-144,
-158,
-170,
-185,
 200,
 203
 ],
@@ -911,46 +876,24 @@
 146,
 147,
 148,
-149,
 150,
-158,
 159,
 160,
 163,
-164,
 182,
-183,
 186,
-187,
 190,
-191,
-229,
 240,
 241,
 242,
 243,
-246,
 255,
 257,
 258,
 259,
-280,
 296,
 299,
 302,
-318,
-333,
-348,
-363,
-376,
-390,
-404,
-418,
-433,
-446,
-460,
-474,
-488,
 500,
 501,
 503,
@@ -965,9 +908,6 @@
 547,
 549,
 563,
-564,
-578,
-589,
 609,
 634,
 655,
@@ -981,7 +921,6 @@
 851,
 876,
 900,
-919,
 932,
 934,
 948,
@@ -989,10 +928,7 @@
 964,
 966,
 988,
-991,
-1013,
-1038,
-1057
+991
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/ShowActionTest.java": [
 72,
@@ -1013,21 +949,10 @@
 120,
 131,
 141,
-142,
-143,
 156,
-157,
 168,
-169,
-183,
-198,
-214,
-223,
 224,
-233,
-234,
-243,
-253
+234
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java": [
 116,
@@ -1044,57 +969,16 @@
 135,
 136,
 137,
-175,
-179,
-199,
-203,
-220,
-240,
-244,
-261,
-282,
-286,
-306,
-330,
-352,
-369,
-388,
-392,
-409,
-410,
-420,
-436,
-439,
-456,
-481,
-500,
-506,
-527,
-550,
-568,
-592,
-722,
-729,
-734,
 738
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/component/ws/TreeActionTest.java": [
 132,
 133,
-134,
 162,
 163,
-164,
-182,
 204,
 205,
-206,
-226,
-247,
-248,
-249,
 260,
-261,
 262,
 263,
 264,
@@ -1171,31 +1055,6 @@
 114,
 120
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java": [
-103,
-113,
-114,
-124,
-125,
-133,
-151,
-152,
-161,
-169,
-170,
-189,
-199,
-209,
-219,
-229,
-264,
-266,
-267,
-268,
-269,
-270,
-271
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java": [
 43,
 44,
@@ -1280,46 +1139,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java": [
 40
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java": [
-80,
-81,
-90,
-96,
-101,
-109,
-110,
-118,
-123,
-131,
-138,
-150,
-157,
-162,
-170,
-171,
-179,
-184,
-192,
-193,
-201,
-206,
-214,
-215,
-223,
-228,
-236,
-237,
-245,
-250,
-258,
-264,
-272,
-287,
-293,
-301,
-307,
-315
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java": [
 50,
 60,
@@ -1372,18 +1191,6 @@
 220,
 221,
 222,
-223,
-224,
-225,
-226,
-227,
-228,
-229,
-230,
-231,
-232,
-233,
-234,
 245,
 256,
 260,
@@ -1431,25 +1238,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java": [
 38,
-44,
-45,
-46,
-51,
-52,
-57,
-62,
-63,
-64,
-69,
-74,
-75,
-80,
-81,
-82,
-87,
-88,
-89,
-90,
 96,
 97,
 104,
@@ -1462,11 +1250,6 @@
 96
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java": [
-76,
-185,
-248,
-249,
-251,
 276,
 278
 ],
@@ -1494,50 +1277,6 @@
 242,
 244
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java": [
-59,
-69,
-79,
-89,
-99,
-107,
-117,
-127,
-137,
-145,
-153,
-163,
-173,
-181,
-189,
-197,
-206,
-225,
-240,
-253
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java": [
-60,
-70,
-80,
-90,
-100,
-108,
-118,
-128,
-138,
-146,
-154,
-164,
-174,
-182,
-190,
-198,
-207,
-226,
-241,
-254
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java": [
 111,
 119
@@ -1558,34 +1297,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java": [
 209
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java": [
-57,
-67,
-77,
-87,
-95,
-105,
-115,
-123,
-131,
-140,
-159,
-174
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java": [
-57,
-67,
-77,
-87,
-95,
-105,
-115,
-123,
-131,
-140,
-159,
-174
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java": [
 129,
 137
@@ -1613,13 +1324,9 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java": [
 51,
-52,
 62,
-63,
 73,
-74,
 84,
-85,
 94,
 98
 ],
@@ -1673,11 +1380,8 @@
 131,
 242,
 270,
-297,
 300,
-301,
 331,
-332,
 340
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java": [
@@ -1768,9 +1472,6 @@
 69,
 70
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java": [
-75
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java": [
 42,
 47,
@@ -1780,16 +1481,6 @@
 55,
 60
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java": [
-109,
-110,
-111,
-112,
-113,
-114,
-115,
-116
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java": [
 95,
 100,
@@ -1799,13 +1490,6 @@
 143,
 153
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java": [
-91,
-92,
-93,
-96,
-97
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java": [
 53,
 66,
@@ -1814,9 +1498,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java": [
 58,
-71,
-72,
-73,
 152
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java": [
@@ -1851,49 +1532,18 @@
 352,
 353
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java": [
-92,
-93,
-94,
-97,
-98
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java": [
-155,
-218,
-219,
-220,
-241,
-242,
-244,
-294,
-295,
-296,
-354,
-359,
-365,
-366
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java": [
 74,
 75,
 79,
 80
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java": [
-52,
-72
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java": [
 74,
 75,
 79,
 80
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java": [
-53,
-73
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java": [
 74,
 75,
@@ -1987,8 +1637,7 @@
 133,
 134,
 157,
-173,
-183
+173
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java": [
 166,
@@ -2058,22 +1707,12 @@
 125,
 126
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java": [
-262
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java": [
 61,
 80,
 97,
 113
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java": [
-230,
-231,
-232,
-233,
-234
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java": [
 50,
 60,
@@ -2087,7 +1726,6 @@
 57,
 58,
 81,
-82,
 91
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java": [
@@ -2244,52 +1882,6 @@
 49,
 56
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java": [
-73,
-81,
-89,
-103,
-104,
-116,
-117,
-135,
-142,
-143,
-154,
-155,
-156,
-157,
-164,
-165,
-172,
-173,
-174,
-185,
-186,
-187,
-188,
-195,
-196,
-207,
-208,
-209,
-210,
-217,
-218,
-230,
-231,
-232,
-242,
-243,
-244,
-245,
-252,
-253,
-264,
-265,
-266,
-267
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java": [
 59,
 60,
@@ -2326,85 +1918,10 @@
 167,
 174
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java": [
-193,
-231,
-261,
-280,
-290,
-291
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java": [
 44,
 59
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java": [
-76,
-83,
-90,
-97,
-104,
-111,
-124,
-125,
-135,
-136,
-137,
-138,
-155,
-156,
-163,
-164,
-165,
-174,
-175,
-176,
-177,
-178,
-179,
-186,
-187,
-194,
-195,
-196,
-205,
-206,
-207,
-208,
-209,
-210,
-217,
-218,
-227,
-228,
-229,
-230,
-231,
-232,
-239,
-240,
-247,
-248,
-249,
-258,
-259,
-260,
-261,
-262,
-263,
-270,
-271,
-280,
-281,
-282,
-283,
-284,
-285,
-303,
-309,
-320,
-331
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java": [
 53,
 54,
@@ -2421,18 +1938,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java": [
 36
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java": [
-150,
-250,
-288,
-318,
-337,
-369,
-397,
-413,
-414,
-415
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java": [
 109,
 117,
@@ -2617,17 +2122,6 @@
 143,
 166
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java": [
-56
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java": [
-80,
-81,
-82,
-96,
-97,
-98
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java": [
 83,
 97,
@@ -2699,18 +2193,6 @@
 136,
 137
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java": [
-45,
-59,
-62,
-63,
-64,
-77,
-79,
-94,
-95,
-96
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java": [
 56,
 79,
@@ -2732,23 +2214,6 @@
 76,
 109
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java": [
-97,
-99,
-120,
-122,
-134,
-146,
-147,
-148,
-161,
-162,
-163,
-225,
-227,
-231,
-242
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java": [
 39,
 40,
@@ -2877,10 +2342,6 @@
 125,
 135
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java": [
-51,
-58
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java": [
 77,
 91,
@@ -2922,7 +2383,6 @@
 332
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java": [
-37,
 38
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java": [
@@ -2941,30 +2401,6 @@
 320,
 322
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java": [
-121,
-144
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java": [
-166,
-173,
-180,
-187,
-194,
-203,
-212,
-221,
-228,
-235,
-236,
-244,
-248
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java": [
-93,
-106,
-120
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java": [
 89,
 90
@@ -3035,7 +2471,6 @@
 182,
 183,
 185,
-186,
 201,
 202,
 203,
@@ -3048,24 +2483,18 @@
 235,
 236,
 238,
-239,
 251,
 265,
 266,
 267,
 268,
 269,
-271,
-272,
 284,
-296,
 309,
 310,
 311,
 312,
 313,
-315,
-316,
 327,
 340,
 341,
@@ -3090,7 +2519,6 @@
 416,
 417,
 419,
-420,
 432
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java": [
@@ -3123,18 +2551,6 @@
 347,
 348
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java": [
-371,
-391,
-392,
-393,
-394,
-395,
-396,
-397,
-398,
-399
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java": [
 90,
 91,
@@ -3307,14 +2723,9 @@
 161,
 172,
 174,
-175,
 176,
-189,
 190,
-191,
 192,
-193,
-194,
 208,
 228,
 241,
@@ -3360,9 +2771,6 @@
 236,
 237
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java": [
-112
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java": [
 230,
 263,
@@ -3370,70 +2778,6 @@
 265,
 266
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java": [
-108,
-109,
-110,
-111,
-123,
-124,
-125,
-126,
-143,
-144,
-145,
-146,
-147,
-148,
-165,
-166,
-167,
-168,
-169,
-170,
-223,
-224,
-225,
-226,
-238,
-239,
-240,
-241,
-255,
-256,
-257,
-258,
-259,
-260,
-306,
-307,
-308,
-309,
-310,
-311,
-327,
-328,
-329,
-330,
-331,
-332
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java": [
-145,
-146,
-147,
-148,
-176,
-177,
-178,
-179,
-206,
-207,
-210,
-211,
-212,
-213
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java": [
 105,
 116,
@@ -3449,7 +2793,6 @@
 229,
 230,
 250,
-252,
 269
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java": [
@@ -3465,51 +2808,6 @@
 168,
 169
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java": [
-465,
-466,
-467,
-468,
-469,
-470,
-478,
-482
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java": [
-101,
-102,
-103,
-104,
-106,
-107,
-108,
-109
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java": [
-126,
-135,
-144,
-153,
-162,
-221,
-263,
-268,
-273,
-279,
-284,
-294,
-296,
-298,
-328,
-332,
-338,
-343,
-354,
-355,
-356,
-360,
-422
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java": [
 125,
 128,
@@ -3522,279 +2820,24 @@
 136,
 137,
 138,
-158,
-159,
-160,
-198,
-216,
-217,
-218,
-224
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java": [
-122,
-125,
-126,
-127,
-128,
-129,
-130,
-131,
-132,
-133,
-134,
-135,
-136,
-137,
-140,
-141,
-142,
-143,
-144,
-145,
-146,
-147,
-148,
-149,
-150,
-151,
-152,
-155,
-156,
-157,
-158,
-159,
-160,
-161,
-162,
-163,
-164,
-165,
-166,
-167,
-168,
-170,
-171,
-172,
-191,
-192,
-195,
-196,
-218,
-219,
-220,
-221,
-252,
-255,
-256,
-257,
-260,
-261,
-262,
-263,
-264,
-265,
-266,
-269,
-270,
-271,
-272,
-273,
-276,
-277,
-278,
-279,
-280,
-308,
-312,
-316,
-320,
-324,
-356,
-359,
-360,
-361,
-362,
-365,
-366,
-367,
-368,
-371,
-372,
-373,
-374,
-408,
-409,
-410,
-411,
-412,
-415,
-416,
-417,
-418,
-419,
-420,
-423,
-424,
-425,
-426,
-427,
-428,
-429,
-432,
-433,
-434,
-435,
-436,
-437,
-438,
-439,
-442,
-443,
-444,
-445,
-446,
-447,
-448,
-449,
-487,
-488,
-511,
-515,
-562,
-567,
-568,
-569,
-570,
-571,
-572,
-573,
-576,
-577,
-578,
-579,
-580,
-581,
-582,
-585,
-586,
-587,
-588,
-589,
-590,
-591,
-610,
-653,
-654,
-655,
-656,
-657,
-664,
-665,
-666,
-667,
-668,
-669,
-670,
-671,
-674,
-675,
-676,
-677,
-678,
-679,
-680,
-681,
-684,
-685,
-686,
-687,
-688,
-689,
-690,
-691,
-692,
-693,
-696,
-697,
-698,
-699,
-700,
-701,
-702,
-703,
-704,
-705,
-711,
-753,
-758,
-759,
-760,
-761,
-762,
-763,
-764,
-765,
-766
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java": [
-201,
-215,
-226
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java": [
-133,
-134,
-135,
-136,
-137,
-138,
-154,
-155,
-156,
-157,
-158,
-159,
-175,
-176,
-177,
-178,
-179,
-180,
-196,
-197,
+158,
+159,
+160,
 198,
-199,
-200,
-201,
+216,
 217,
 218,
-219,
-220,
-221,
-222,
-269,
-270,
-271,
-272,
-283,
-284,
-285,
-286
+224
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java": [
+201,
+215,
+226
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java": [
 141,
 149
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java": [
-329,
-333
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java": [
-226,
-230,
-234
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java": [
 105,
 116,
@@ -3817,26 +2860,6 @@
 168,
 169
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java": [
-355,
-356,
-357,
-358,
-359,
-369,
-373
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java": [
-99
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java": [
-129,
-134,
-176,
-180,
-184,
-188
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java": [
 112,
 115,
@@ -3854,7 +2877,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java": [
 187,
 352,
-370,
 456,
 460,
 479,
@@ -3904,14 +2926,8 @@
 222,
 242
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java": [
-279,
-284,
-292
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookCallerImplTest.java": [
 65,
-66,
 67,
 68,
 69,
@@ -3924,7 +2940,6 @@
 78,
 88,
 89,
-91,
 92,
 93,
 94,
@@ -3936,7 +2951,6 @@
 108,
 109,
 125,
-126,
 127,
 128,
 129,
@@ -3978,14 +2992,9 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java": [
 68,
-69,
 85,
-86,
-87,
 101,
-102,
-128,
-129
+128
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java": [
 88,
@@ -4246,7 +3255,6 @@
 87
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/IndexCreatorTest.java": [
-41,
 51,
 52,
 53,
@@ -4344,7 +3352,6 @@
 270
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/RecoveryIndexerTest.java": [
-97,
 136,
 155,
 172,
@@ -4382,11 +3389,7 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/SortingTest.java": [
 46,
 47,
-48,
-49,
 51,
-52,
-53,
 64,
 76,
 88,
@@ -4400,8 +3403,6 @@
 150
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java": [
-49,
-56,
 67,
 71
 ],
@@ -4478,7 +3479,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java": [
 48,
 49,
-57,
 64,
 66,
 67,
@@ -4490,7 +3490,6 @@
 97
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java": [
-60,
 71,
 73,
 74,
@@ -4504,7 +3503,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java": [
 49,
 58,
-59,
 67,
 69,
 70,
@@ -4519,9 +3517,6 @@
 112
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java": [
-43,
-44,
-53,
 62,
 64,
 65,
@@ -4536,7 +3531,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java": [
 48,
 49,
-58,
 65,
 67,
 68,
@@ -4551,7 +3545,6 @@
 55,
 57,
 59,
-71,
 78,
 80,
 88,
@@ -4567,7 +3560,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java": [
 56,
 58,
-70,
 77,
 79,
 80,
@@ -4581,7 +3573,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java": [
 50,
 51,
-60,
 67,
 69,
 70,
@@ -4596,7 +3587,6 @@
 49,
 51,
 52,
-60,
 67,
 69,
 70,
@@ -4679,16 +3669,10 @@
 112
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/favorite/ws/SearchActionTest.java": [
-79,
-82,
 92,
-93,
 105,
 106,
 118,
-121,
-136,
-149,
 169,
 170
 ],
@@ -5317,7 +4301,6 @@
 923,
 926,
 927,
-943,
 958,
 959,
 960,
@@ -5639,13 +4622,8 @@
 56,
 57,
 58,
-59,
 64
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java": [
-33,
-34
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java": [
 55,
 57,
@@ -5801,42 +4779,11 @@
 461
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java": [
-86,
 87,
 88,
 89,
-90,
-91,
-106,
-107,
-108,
-110,
-121,
-123,
-135,
 136,
 137,
-138,
-149,
-150,
-151,
-152,
-153,
-164,
-165,
-166,
-167,
-168,
-180,
-182,
-194,
-195,
-207,
-208,
-222,
-234,
-235,
-245,
 275,
 276,
 277,
@@ -5844,22 +4791,8 @@
 279
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java": [
-53,
-54,
-55,
-56,
 57,
-58,
-61,
-62,
-63,
-65,
-66,
-67,
-69,
 70,
-71,
-72,
 102,
 103,
 104,
@@ -5925,7 +4858,6 @@
 110,
 111,
 122,
-123,
 124,
 125,
 165,
@@ -5945,21 +4877,9 @@
 150,
 161,
 172,
-173,
 174,
 175,
-209,
-210,
-211,
-212,
-213,
-216,
-217,
-218,
-220,
 221,
-222,
-223,
 256,
 259,
 262
@@ -5967,7 +4887,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java": [
 110,
 121,
-122,
 123,
 124,
 166,
@@ -5981,47 +4900,23 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/issue/ws/TagsActionTest.java": [
 165,
-195,
-196,
-197,
-198,
-199,
 202,
-203,
-204,
-205,
 208,
-209,
 210,
-211,
-212,
 215,
-216,
-217,
-218,
-219,
 220
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/language/ws/LanguageWsTest.java": [
 63,
-64,
-65,
 66,
 67,
-68,
 71,
-72,
-73,
-74,
-75,
-76,
-77
+73
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/license/ws/LicensesWsModuleTest.java": [
 32
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/license/ws/ListActionTest.java": [
-85,
 87,
 88,
 89,
@@ -6034,7 +4929,6 @@
 97,
 98,
 99,
-110,
 112,
 113,
 114,
@@ -6046,7 +4940,6 @@
 121,
 122,
 123,
-134,
 136,
 137,
 138,
@@ -6059,30 +4952,23 @@
 146,
 147,
 148,
-160,
 162,
 163,
 164,
 165,
-177,
 179,
 180,
 181,
 182,
-193,
 195,
-206,
 208,
 209,
-221,
 223,
 224,
-236,
 238,
 239,
 240,
 241,
-252,
 267,
 268,
 269,
@@ -6237,7 +5123,6 @@
 119,
 131,
 148,
-158,
 174,
 185
 ],
@@ -6269,30 +5154,19 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java": [
 132,
-133,
-134,
-135,
-166,
 169,
 170,
-171,
-207,
 210,
 211,
 214,
 215,
 246,
 248,
-288,
 289,
 290,
 291,
-317,
 318,
-352,
 354,
-380,
-411,
 430,
 431
 ],
@@ -6338,15 +5212,12 @@
 141,
 143,
 144,
-147,
-173,
 189,
 191,
 192,
 207,
 209,
 210,
-228,
 241,
 245,
 370,
@@ -6357,36 +5228,15 @@
 375
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/measure/ws/SearchHistoryActionTest.java": [
-116,
 117,
-121,
-135,
-136,
-137,
-147,
-168,
-169,
 175,
-177,
 180,
-181,
 185,
-187,
-204,
-205,
-223,
-224,
 238,
-239,
-240,
 245,
-246,
-247,
 258,
 269,
 270,
-271,
-272,
 322,
 323,
 324,
@@ -6595,15 +5445,6 @@
 156
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/notification/ws/ListActionTest.java": [
-104,
-111,
-118,
-131,
-142,
-153,
-167,
-186,
-207,
 254,
 255,
 256,
@@ -6737,7 +5578,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java": [
 90,
-91,
 146,
 147,
 148,
@@ -6788,11 +5628,8 @@
 557,
 617,
 618,
-620,
 622,
-625,
 627,
-630,
 632,
 636,
 637,
@@ -6918,30 +5755,10 @@
 183,
 197,
 201,
-214,
-215,
-218,
-219,
-222,
-223,
-226,
-227,
 237
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java": [
-81,
-84,
-99,
-121,
-134,
-147,
-167,
-188,
-205,
-208,
-222,
-236,
-252,
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java": [
+134,
 302,
 303,
 304,
@@ -6950,8 +5767,6 @@
 307,
 308,
 309,
-312,
-313,
 314
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/SearchMyOrganizationsActionTest.java": [
@@ -7165,37 +5980,9 @@
 272
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java": [
-75,
-90,
-103,
-118,
-119,
-134,
-135,
-151,
-152,
-362,
-380,
-397,
-412,
-429,
-446
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java": [
-76,
-91,
-107,
-108,
-122,
-123,
-137,
-138,
-313,
-363,
-379
+380
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java": [
-123,
 136,
 151,
 175,
@@ -7223,25 +6010,6 @@
 77,
 78
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java": [
-80,
-94,
-111,
-112,
-129,
-130,
-147,
-148,
-338,
-356
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java": [
-85,
-115,
-131,
-147,
-309
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java": [
 107,
 110,
@@ -7276,8 +6044,7 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/AddProjectCreatorToTemplateActionTest.java": [
 90,
 91,
-134,
-135
+134
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java": [
 69,
@@ -7355,7 +6122,6 @@
 78,
 79,
 139,
-140,
 146
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java": [
@@ -7375,24 +6141,6 @@
 200,
 201
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java": [
-133,
-134,
-135,
-136,
-165,
-166,
-167,
-191,
-212,
-231,
-249,
-250,
-251,
-252,
-268,
-269
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java": [
 93,
 94,
@@ -7451,8 +6199,7 @@
 71
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java": [
-70,
-71
+70
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java": [
 50,
@@ -7489,7 +6236,6 @@
 104,
 110,
 111,
-117,
 122,
 131,
 139
@@ -7501,11 +6247,6 @@
 118,
 119
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/platform/ServerIdManagerTest.java": [
-72,
-86,
-105
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ServerImplTest.java": [
 55,
 56,
@@ -7523,9 +6264,6 @@
 67,
 73
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java": [
-52
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java": [
 54
 ],
@@ -7583,8 +6321,7 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java": [
 119,
-143,
-144
+143
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java": [
 51
@@ -7652,7 +6389,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/monitoring/SettingsMonitorTest.java": [
 48,
-56,
 63,
 68
 ],
@@ -7685,15 +6421,13 @@
 62,
 65,
 68,
-80,
 83,
 86
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java": [
 69,
 127,
-128,
-139
+128
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/web/RootFilterTest.java": [
 88,
@@ -7772,8 +6506,7 @@
 50
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/RestartActionTest.java": [
-85,
-127
+85
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/ws/ServerWsTest.java": [
 39,
@@ -7900,24 +6633,7 @@
 68,
 74,
 77,
-80,
-97,
-98,
-108,
-109,
-126,
-127,
-137,
-138,
-160,
-161,
-173,
-184
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java": [
-63,
-64,
-69
+80
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java": [
 81,
@@ -8015,21 +6731,13 @@
 123,
 124,
 137,
-139,
 253,
 254,
 255,
 257
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/project/ws/CreateActionTest.java": [
-105,
 108,
-123,
-140,
-155,
-170,
-185,
-200,
 217,
 305,
 306,
@@ -8059,8 +6767,6 @@
 72,
 75,
 76,
-77,
-78,
 110,
 134,
 149,
@@ -8082,8 +6788,6 @@
 77,
 81,
 84,
-85,
-86,
 87,
 120,
 138,
@@ -8091,16 +6795,6 @@
 169
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/project/ws/SearchActionTest.java": [
-98,
-110,
-122,
-134,
-151,
-163,
-175,
-189,
-204,
-218,
 248,
 249,
 250,
@@ -8132,17 +6826,14 @@
 121,
 122,
 138,
-140,
 156,
-157,
 171,
 172,
 186,
 187,
 204,
 205,
-226,
-227
+226
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java": [
 120,
@@ -8174,8 +6865,6 @@
 600,
 602,
 604,
-606,
-608,
 613,
 615,
 617,
@@ -8184,10 +6873,7 @@
 627,
 634,
 636,
-638,
-640,
-642,
-644
+638
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/projectanalysis/ProjectAnalysisModuleTest.java": [
 33
@@ -8202,7 +6888,6 @@
 126,
 127,
 128,
-143,
 159,
 174,
 176,
@@ -8239,14 +6924,7 @@
 154,
 156,
 157,
-175,
 196,
-221,
-223,
-242,
-262,
-283,
-304,
 312,
 313,
 314,
@@ -8317,7 +6995,6 @@
 117,
 118,
 130,
-132,
 147,
 148,
 316,
@@ -8332,8 +7009,6 @@
 42
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java": [
-89,
-98,
 105,
 106,
 107,
@@ -8362,15 +7037,12 @@
 451
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/QgateProjectFinderTest.java": [
-86,
 102,
 122,
 140,
 234,
 235,
-239,
-243,
-244
+243
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java": [
 314,
@@ -8389,10 +7061,8 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java": [
 55,
 56,
-57,
 69,
 70,
-71,
 80
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java": [
@@ -8431,16 +7101,8 @@
 79,
 80,
 81,
-82,
 98,
 100,
-101,
-114,
-130,
-145,
-160,
-169,
-178,
 209,
 210,
 211,
@@ -8474,11 +7136,8 @@
 163,
 164,
 166,
-168,
 171,
-173,
-176,
-178
+176
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/DeselectActionTest.java": [
 219,
@@ -8528,85 +7187,60 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/QualityGatesWsTest.java": [
 90,
 91,
-92,
-93,
 96,
 97,
 98,
-99,
-100,
 103,
 104,
 105,
-106,
 107,
-108,
 111,
 112,
 113,
-114,
 115,
-116,
 119,
 120,
 121,
-122,
 123,
 124,
-125,
 128,
 129,
 130,
-131,
 132,
-133,
 136,
 137,
 138,
-139,
 140,
 141,
-142,
 145,
 146,
 147,
-148,
 149,
-150,
 153,
 154,
 155,
-156,
-157,
 160,
 161,
 162,
-163,
 164,
 165,
 166,
 167,
 168,
 169,
-170,
 173,
 174,
 175,
-176,
 177,
 178,
 179,
 180,
 181,
 182,
-183,
 186,
 187,
 188,
-189,
 190,
-191,
-194,
 347,
 369
 ],
@@ -8630,11 +7264,8 @@
 171,
 172,
 174,
-176,
 179,
-181,
-184,
-186
+184
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeTest.java": [
 44,
@@ -8753,73 +7384,26 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java": [
 95,
 96,
-97,
-98,
-99,
-100,
-101,
 113,
 114,
-115,
-116,
-117,
-118,
-119,
 129,
 130,
-131,
-132,
-133,
-134,
-135,
 144,
 145,
-146,
-147,
-148,
-149,
-150,
 160,
 161,
-162,
-163,
-164,
-165,
-166,
 176,
 177,
-178,
-179,
-180,
-181,
-182,
 185,
 186,
-187,
 197,
 198,
-199,
-200,
-201,
-202,
-203,
 206,
-207,
-208,
 210,
 211,
 221,
 222,
-223,
-224,
-225,
-226,
-227,
-230,
-231,
-232,
-233,
-234
+230
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java": [
 66,
@@ -8915,13 +7499,11 @@
 84,
 88,
 92,
-95,
 99,
 100,
 104,
 105,
 106,
-109,
 114,
 116,
 118,
@@ -8957,15 +7539,12 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java": [
 82,
 83,
-84,
 98,
 99,
 116,
 117,
-118,
-132,
-133,
-134
+132,
+133
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java": [
 255,
@@ -9243,15 +7822,9 @@
 138,
 139,
 140,
-141,
-142,
-143,
-144,
 155,
 156,
 157,
-167,
-168,
 184,
 200,
 209,
@@ -9315,8 +7888,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java": [
 181,
 182,
-184,
-185,
 207,
 208,
 235,
@@ -9420,9 +7991,7 @@
 341,
 351,
 362,
-367,
 377,
-382,
 404,
 426,
 427,
@@ -9548,22 +8117,6 @@
 117,
 120,
 121,
-128,
-138,
-152,
-167,
-181,
-195,
-207,
-220,
-234,
-250,
-267,
-285,
-304,
-320,
-371,
-388,
 403,
 404,
 405,
@@ -9600,19 +8153,13 @@
 99,
 111,
 121,
-132,
 146,
 147,
 148,
 171,
-201,
-221,
-234,
 246,
 258,
-270,
-285,
-301
+270
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/root/ws/RootsWsModuleTest.java": [
 38
@@ -9928,8 +8475,7 @@
 460,
 462,
 463,
-472,
-480
+472
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/RuleCreatorTest.java": [
 92,
@@ -9968,7 +8514,6 @@
 182,
 183,
 184,
-221,
 254,
 255,
 258,
@@ -10164,7 +8709,6 @@
 639,
 674,
 678,
-679,
 683,
 687,
 691,
@@ -10331,13 +8875,6 @@
 218,
 219,
 220,
-271,
-284,
-296,
-310,
-312,
-330,
-333,
 371,
 372,
 375,
@@ -10351,7 +8888,6 @@
 405,
 406,
 407,
-408,
 409,
 410,
 411,
@@ -10364,8 +8900,6 @@
 440,
 441,
 442,
-443,
-444,
 446,
 447,
 468,
@@ -10377,14 +8911,11 @@
 476,
 477,
 478,
-479,
 480,
-481,
 482,
 500,
 501,
 504,
-505,
 506,
 524,
 525,
@@ -10401,21 +8932,15 @@
 604,
 605,
 606,
-607,
 612,
 613,
 661,
 662,
 663,
 664,
-665,
 668,
 669,
 688,
-689,
-726,
-734,
-735,
 755,
 756,
 757,
@@ -10438,10 +8963,7 @@
 221,
 222,
 223,
-224,
-225,
-226,
-227
+226
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/TagsActionTest.java": [
 71,
@@ -10532,7 +9054,6 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/serverid/ws/GenerateActionTest.java": [
 74,
-101,
 108,
 109,
 110,
@@ -10553,28 +9074,7 @@
 73,
 74,
 75,
-76,
-77,
-88,
 89,
-90,
-91,
-92,
-101,
-102,
-103,
-104,
-105,
-115,
-116,
-117,
-118,
-119,
-129,
-130,
-131,
-132,
-133,
 149,
 150,
 151,
@@ -10629,7 +9129,6 @@
 258
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java": [
-75,
 82,
 83,
 84,
@@ -10654,7 +9153,6 @@
 75
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java": [
-112,
 114,
 115,
 116,
@@ -10663,7 +9161,6 @@
 119,
 120,
 121,
-133,
 135,
 136,
 137,
@@ -10674,17 +9171,13 @@
 142,
 143,
 144,
-158,
 160,
 161,
 162,
-173,
 174,
 175,
-189,
 191,
 192,
-208,
 210,
 211,
 213,
@@ -10697,19 +9190,6 @@
 221,
 222,
 223,
-237,
-238,
-248,
-261,
-275,
-289,
-299,
-312,
-325,
-339,
-353,
-366,
-379,
 395,
 396,
 397,
@@ -10760,22 +9240,6 @@
 934,
 991
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java": [
-71,
-74,
-82,
-107,
-118,
-120,
-132,
-177,
-186,
-187,
-188,
-190,
-192,
-194
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java": [
 201,
 205,
@@ -10787,49 +9251,22 @@
 32
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java": [
-112,
 114,
 115,
 116,
-134,
 137,
 138,
 141,
 142,
-153,
 155,
 156,
-173,
 175,
-194,
 196,
-210,
-224,
-240,
-258,
-270,
 282,
 283,
 284,
-296,
-310,
-325,
-345,
-363,
-476,
 478,
 479,
-497,
-534,
-555,
-580,
-593,
-611,
-631,
-642,
-677,
-694,
-710,
 724,
 784,
 785,
@@ -10964,10 +9401,8 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/startup/DeleteOldAnalysisReportsFromFsTest.java": [
 76,
 77,
-78,
 87,
-88,
-89
+88
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/startup/DisplayLogOnDeprecatedProjectsTest.java": [
 60,
@@ -10981,51 +9416,18 @@
 66,
 67
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/startup/LogServerIdTest.java": [
-70,
-122
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/startup/RegisterMetricsTest.java": [
 127
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java": [
 83,
 86,
-94,
 104,
 107,
-113,
 151,
 157,
 158
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/test/index/TestIndexTest.java": [
-49,
-50,
-51,
-63,
-64,
-76,
-77,
-88,
-89,
-90,
-91,
-92,
-93,
-94,
-95,
-108,
-109,
-110,
-111,
-112,
-113,
-114,
-115,
-133,
-134
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/test/index/TestIndexerTest.java": [
 87,
 97,
@@ -11058,13 +9460,11 @@
 174,
 175,
 176,
-178,
 189,
 190,
 191
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/test/ws/ListActionTest.java": [
-98,
 100,
 101,
 102,
@@ -11075,11 +9475,6 @@
 107,
 108,
 109,
-121,
-136,
-151,
-166,
-181,
 191,
 192,
 193
@@ -11122,8 +9517,7 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java": [
 44,
 52,
-56,
-57
+56
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ui/PageDecorationsTest.java": [
 34,
@@ -11238,13 +9632,8 @@
 79
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/DoPrivilegedTest.java": [
-49,
-50,
-51,
 54,
-72,
-75,
-76
+72
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ExternalIdentityTest.java": [
 36,
@@ -11290,9 +9679,6 @@
 131,
 136,
 137,
-144,
-145,
-146,
 147,
 154,
 155,
@@ -11335,12 +9721,6 @@
 383,
 388,
 389,
-400,
-408,
-409,
-417,
-418,
-427,
 436,
 445,
 455,
@@ -11381,7 +9761,6 @@
 118,
 121,
 123,
-125,
 142,
 143,
 144,
@@ -11451,7 +9830,6 @@
 807,
 808,
 811,
-813,
 832,
 833,
 834,
@@ -11469,7 +9847,6 @@
 881,
 882,
 885,
-887,
 907,
 923,
 926,
@@ -11518,7 +9895,6 @@
 72,
 80,
 81,
-93,
 94,
 97,
 99,
@@ -11567,40 +9943,20 @@
 128
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ws/CreateActionTest.java": [
-111,
 114,
 115,
 116,
 117,
 121,
-122,
 125,
 154,
 155,
 171,
 186,
-201,
-215,
-229,
-247,
 336,
 340
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ws/CurrentActionTest.java": [
-75,
-96,
-97,
-98,
-99,
-100,
-112,
-124,
-140,
-163,
-164,
-168,
-169,
-170,
 199,
 200,
 201,
@@ -11629,25 +9985,14 @@
 314,
 356,
 361,
-362,
-363,
-364
+363
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/ws/GroupsActionTest.java": [
-78,
-92,
-108,
-122,
-136,
-147,
-164,
 165,
 166,
 167,
 178,
 180,
-194,
-217,
 317,
 318,
 319,
@@ -11796,22 +10141,6 @@
 172
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java": [
-78,
-97,
-116,
-132,
-133,
-139,
-140,
-145,
-146,
-155,
-157,
-159,
-161,
-163,
-177,
-187,
 224,
 225,
 226,
@@ -12020,13 +10349,7 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/view/index/ViewIndexerTest.java": [
 78,
 88,
-92,
-93,
-94,
-95,
 105,
-109,
-110,
 118,
 121,
 122,
@@ -12129,7 +10452,6 @@
 250,
 251,
 252,
-253,
 263,
 265,
 266,
@@ -12140,8 +10462,7 @@
 293,
 294,
 303,
-304,
-318
+304
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/ws/WebServiceFilterTest.java": [
 70,
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2699.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2699.json
index cf0f347abd4..c319b981518 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2699.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2699.json
@@ -1,8 +1,4 @@
 {
-"sonarqube-6.5:src/test/java/org/sonar/ce/http/CeHttpClientTest.java": [
-123,
-132
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java": [
 70
 ],
@@ -34,27 +30,15 @@
 276
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java": [
-270,
 307
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java": [
 119,
 130
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java": [
-92,
-250
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java": [
-146
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/DefaultIndexSettingsTest.java": [
 43
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/RecoveryIndexerTest.java": [
-103,
-204
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java": [
 43
 ],
@@ -64,9 +48,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyClusterStatsRequestBuilderTest.java": [
 43
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java": [
-44
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java": [
 42
 ],
@@ -79,9 +60,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java": [
 42
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java": [
-45
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java": [
 46
 ],
@@ -94,9 +72,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java": [
 43
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/measure/ws/SearchActionTest.java": [
-317
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java": [
 161
 ],
@@ -106,16 +81,9 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java": [
 272
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/permission/ws/template/TemplateGroupsActionTest.java": [
-86
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java": [
 79
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/platform/ServerIdManagerTest.java": [
-154,
-162
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java": [
 123
 ],
@@ -134,9 +102,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java": [
 132
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregateBuilderTest.java": [
-49
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java": [
 152,
 162
@@ -151,9 +116,6 @@
 173,
 183
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java": [
-728
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/ResetActionTest.java": [
 183,
 294,
@@ -164,15 +126,9 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java": [
 35
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/ui/ws/ComponentActionTest.java": [
-390
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/user/NewUserNotifierTest.java": [
 33
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/user/UserSessionFilterTest.java": [
-236
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/usertoken/ws/RevokeActionTest.java": [
 93
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3032.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3032.json
index 68e082a5dd8..0207b72c37d 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3032.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3032.json
@@ -1,12 +1,8 @@
 {
 "sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java": [
-90,
-94
+90
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java": [
 138
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java": [
-62
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3252.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3252.json
index 95bba3454b1..4876a86101d 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3252.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3252.json
@@ -1,20 +1,53 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/app/ServerProcessLogging.java": [
+40
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/index/ComponentIndexer.java": [
+58
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java": [
 132
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java": [
 100
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/permission/PermissionTemplateService.java": [
-215
+"sonarqube-6.5:src/main/java/org/sonar/server/es/EsUtils.java": [
+91
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/IssueQuery.java": [
+52
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/index/IssueIndexer.java": [
+68
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java": [
+53
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexer.java": [
+58
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java": [
+58
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java": [
+43
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java": [
+218
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java": [
+86
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/test/index/TestIndexer.java": [
+76
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java": [
-118
+"sonarqube-6.5:src/main/java/org/sonar/server/user/index/UserIndexer.java": [
+63
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java": [
-72
+"sonarqube-6.5:src/main/java/org/sonar/server/user/ws/UserJsonWriter.java": [
+48
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/platform/ServerLogging.java": [
-60
+"sonarqube-6.5:src/main/java/org/sonar/server/view/index/ViewIndexer.java": [
+52
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3878.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3878.json
new file mode 100644
index 00000000000..a451c445ae4
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3878.json
@@ -0,0 +1,11 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/ce/http/CeHttpClient.java": [
+106
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ce/ws/ActivityAction.java": [
+242
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java": [
+171
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4144.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4144.json
index 0cfbf1f25a2..fc92712bee3 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4144.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4144.json
@@ -20,12 +20,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java": [
 43
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java": [
-159
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java": [
-160
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java": [
 180
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4248.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4248.json
index 649c0f0930e..bdcc4b6026c 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4248.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4248.json
@@ -1,22 +1,10 @@
 {
-"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/SuggestionsAction.java": [
-252
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java": [
 102
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/Facets.java": [
 118
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java": [
-95
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-104
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/platform/UrlSettings.java": [
-47
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/platform/web/WebPagesFilter.java": [
 79
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4276.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4276.json
index 4e3b5cb9404..7f6ddfc89fd 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4276.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4276.json
@@ -1,5 +1,23 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java": [
+307
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java": [
 79
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/IndexType.java": [
+54
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/StickyFacetBuilder.java": [
+83,
+91,
+117,
+139
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/SearchAction.java": [
+181
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/index/RuleIndex.java": [
+382
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5838.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5838.json
index d237d70a568..c7ffc813edb 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5838.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5838.json
@@ -42,10 +42,6 @@
 "sonarqube-6.5:src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java": [
 86
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java": [
-186,
-188
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java": [
 138
 ],
@@ -98,11 +94,6 @@
 113,
 120
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java": [
-161,
-162,
-172
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java": [
 61
 ],
@@ -209,8 +200,7 @@
 52
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java": [
-77,
-78
+77
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java": [
 76
@@ -224,9 +214,6 @@
 135,
 136
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java": [
-109
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java": [
 78
 ],
@@ -662,9 +649,6 @@
 151,
 153
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/ShowActionTest.java": [
-221
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java": [
 232
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5845.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5845.json
index 0f7fe29a807..352a0b519e2 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5845.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S5845.json
@@ -10,9 +10,6 @@
 143,
 232
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/qualitygate/ws/CreateActionTest.java": [
-66
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/RuleActivatorTest.java": [
 1107,
 1108,
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6073.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6073.json
new file mode 100644
index 00000000000..ab070e6a158
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6073.json
@@ -0,0 +1,39 @@
+{
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java": [
+150
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java": [
+78
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java": [
+93,
+122
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java": [
+95,
+155
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java": [
+110,
+131,
+147,
+162,
+178,
+192,
+206
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java": [
+136,
+148,
+163,
+176,
+192,
+205,
+236,
+251,
+282,
+298,
+314,
+326
+]
+}
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S8786.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S8786.json
index 3aca0ef27eb..f4212caf66b 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S8786.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S8786.json
@@ -5,9 +5,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java": [
 102
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/platform/UrlSettings.java": [
-47
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/util/MetricKeyValidator.java": [
 50
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9357.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9357.json
index f8acccbe385..bb36ef424c1 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9357.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9357.json
@@ -1,85 +1,4 @@
 {
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java": [
-55
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/issue/IssuesFinderSort.java": [
-89,
-142
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java": [
-64
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java": [
-46,
-52
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java": [
-184
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java": [
-86,
-210
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java": [
-267
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java": [
-65
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java": [
-98
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java": [
-83
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java": [
-93,
-111
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java": [
-42,
-63
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java": [
-235
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/es/EsTester.java": [
-168
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java": [
-259
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/notification/NotificationDaemonTest.java": [
-252
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java": [
-55
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java": [
-54
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java": [
-118,
-135,
-149,
-183,
-205,
-230,
-265,
-290,
-320,
-356,
-380,
-403
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/rule/RegisterRulesTest.java": [
-252,
-268,
-287,
-299,
-322,
-334
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java": [
 44
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9395.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9395.json
index 3afbcecab3d..8e01d840a51 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9395.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9395.json
@@ -3,6 +3,12 @@
 120,
 121
 ],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java": [
+134
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java": [
+140
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java": [
 83
 ]
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9396.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9396.json
index 2c63c085104..9857c27bd9b 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9396.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S9396.json
@@ -1,2 +1,208 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/BaseContextFactory.java": [
+55,
+56,
+57
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java": [
+67,
+68,
+69
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java": [
+198
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java": [
+102,
+104,
+105
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java": [
+60,
+61
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java": [
+192,
+241,
+242
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java": [
+104,
+105,
+106
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java": [
+57,
+59
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java": [
+70
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java": [
+78
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java": [
+92,
+93,
+94
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java": [
+68
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java": [
+101
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java": [
+68,
+69
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java": [
+145,
+146
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java": [
+75,
+76
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java": [
+76,
+77
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java": [
+95,
+97,
+98
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java": [
+95
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java": [
+80
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java": [
+90,
+91,
+92,
+93,
+94
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java": [
+94,
+95,
+96
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java": [
+98,
+99,
+100,
+101,
+103
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java": [
+283,
+284,
+285,
+286,
+287,
+288,
+289
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/ChangelogAction.java": [
+151,
+152,
+153
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/DeleteCommentAction.java": [
+108,
+109
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/EditCommentAction.java": [
+129,
+130,
+131
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/SearchAction.java": [
+102,
+103,
+104,
+105,
+106,
+107
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java": [
+145
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/property/ws/IndexAction.java": [
+187,
+188
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java": [
+145,
+146
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/setting/ws/ValuesAction.java": [
+178,
+179,
+181,
+182,
+183,
+184
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/util/cache/DiskCache.java": [
+79
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ws/DefaultLocalResponse.java": [
+62,
+64
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java": [
+291,
+342
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java": [
+266,
+315
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java": [
+223
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/es/RecoveryIndexerTest.java": [
+314,
+328,
+342,
+357,
+377,
+399,
+400,
+401
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java": [
+155
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java": [
+307
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java": [
+300,
+301
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/setting/ThreadLocalSettingsTest.java": [
+250,
+251,
+252
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/startup/RegisterMetricsTest.java": [
+146
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/user/DoPrivilegedTest.java": [
+81
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/ws/DumbResponse.java": [
+46,
+48
+],
+"sonarqube-6.5:src/test/java/org/sonar/server/ws/WsTester.java": [
+158,
+159
+]
 }