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-S1128.json b/its/ruling/src/test/resources/expected/mall/java-S1128.json
index 7dfdd6cb290..6e3963d3d9e 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S1128.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S1128.json
@@ -59,6 +59,11 @@
 "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
 ]
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..a1ea32b7748 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S2325.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S2325.json
@@ -9,17 +9,13 @@
 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
 ],
 "mall:mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java": [
-85,
-213,
-222,
-233
+85
 ],
 "mall:mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java": [
 245
diff --git a/its/ruling/src/test/resources/expected/mall/java-S3254.json b/its/ruling/src/test/resources/expected/mall/java-S3254.json
new file mode 100644
index 00000000000..9d4dcbbeeb9
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/mall/java-S3254.json
@@ -0,0 +1,5 @@
+{
+"mall:mall-search/src/main/java/com/macro/mall/search/domain/EsProduct.java": [
+22
+]
+}
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..812ed09e455 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,20 @@
 {
+"mall:mall-admin/src/main/java/com/macro/mall/bo/AdminUserDetails.java": [
+33
+],
 "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/PmsPortalProductServiceImpl.java": [
+80,
+140
+],
 "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..f5ab961b755 100644
--- a/its/ruling/src/test/resources/expected/mall/java-S6212.json
+++ b/its/ruling/src/test/resources/expected/mall/java-S6212.json
@@ -726,7 +726,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
@@ -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,
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S109.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S109.json
index 63502c0e1e5..6a1fd2e8a69 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S109.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S109.json
@@ -116,11 +116,6 @@
 101,
 106
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-123,
-124,
-146
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/EsClientProvider.java": [
 76
 ],
@@ -132,15 +127,6 @@
 92,
 105
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
-52,
-63,
-76,
-87,
-98,
-108,
-118
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/favorite/ws/SearchAction.java": [
 69
 ],
@@ -216,13 +202,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndexDefinition.java": [
 54
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-63,
-70,
-78,
-89,
-96
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java": [
 139
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1108.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1108.json
index 6c7938c2796..5bf9ed94a4d 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1108.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1108.json
@@ -346,10 +346,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/email/ws/SendAction.java": [
 77
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-105,
-187
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/EsClientProvider.java": [
 62,
 77
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1120.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1120.json
index f781e2c4ec7..2261dae6f5f 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1120.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1120.json
@@ -188,26 +188,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/app/ProcessCommandWrapper.java": [
 26
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java": [
-31,
-34,
-39,
-44,
-49,
-53,
-57,
-59,
-63,
-66,
-67,
-73,
-74,
-80,
-81,
-85,
-89,
-93
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/app/ProgrammaticLogbackValve.java": [
 36,
 37,
@@ -4245,31 +4225,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java": [
 43
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java": [
-40,
-50,
-58,
-63,
-64,
-68,
-77,
-78,
-84,
-86,
-90,
-96,
-97,
-102,
-104,
-111,
-118,
-121,
-122,
-127,
-132,
-137,
-141
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java": [
 31,
 38,
@@ -5917,117 +5872,10 @@
 100,
 104
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-63,
-77,
-81,
-95,
-103,
-104,
-106,
-115,
-121,
-135,
-137,
-140,
-148,
-155,
-159,
-169,
-175,
-177,
-183,
-185,
-186,
-188,
-198,
-202,
-206,
-207,
-218,
-219,
-223,
-227,
-228,
-231,
-235,
-239,
-241,
-253,
-255,
-260,
-266,
-273,
-282,
-299,
-306
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettings.java": [
 29,
 72
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java": [
-61,
-62,
-76,
-77,
-89,
-90,
-99,
-100,
-108,
-109,
-119,
-120,
-126,
-135,
-136,
-143,
-144,
-150,
-160,
-161,
-168,
-169,
-175,
-185,
-186,
-193,
-194,
-200,
-210,
-211,
-218,
-219,
-225,
-235,
-236,
-243,
-244,
-250,
-260,
-261,
-269,
-270,
-276,
-277,
-284,
-290,
-296,
-300,
-304,
-308,
-312,
-316,
-320,
-324,
-328,
-332,
-338,
-342,
-346,
-350
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/EsClient.java": [
 77,
 82,
@@ -6710,35 +6558,6 @@
 34,
 38
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
-50,
-51,
-57,
-58,
-60,
-69,
-70,
-72,
-82,
-83,
-85,
-96,
-97,
-103,
-104,
-106,
-113,
-114,
-116,
-122,
-125,
-130,
-134,
-139,
-140,
-152,
-158
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactory.java": [
 48,
 53,
@@ -8536,27 +8355,6 @@
 26,
 27
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-45,
-50,
-57,
-61,
-62,
-68,
-69,
-75,
-76,
-83,
-84,
-94,
-95,
-100,
-103,
-109,
-113,
-114,
-125
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentAction.java": [
 84,
 91,
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..296161b27e2 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,50 +1,5 @@
 {
 "sonarqube-6.5:src/main/java/org/sonar/server/notification/DefaultNotificationManager.java": [
 24
-],
-"sonarqube-6.5:src/main/java/org/sonar/server/qualitygate/QualityGates.java": [
-47
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java": [
-29
-],
-"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/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/setting/DatabaseSettingsEnablerTest.java": [
-26,
-27,
-28
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/setting/NopSettingLoaderTest.java": [
-24
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java": [
-25
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java": [
-30
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java": [
-31
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java": [
-30,
-36
-],
-"sonarqube-6.5:src/test/java/org/sonar/server/usertoken/ws/SearchActionTest.java": [
-37
-],
-"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..f8e7832c8b2 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
@@ -515,13 +515,11 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java": [
 56,
-88,
-123
+88
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java": [
 55,
-87,
-106
+87
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java": [
 45,
@@ -692,7 +690,6 @@
 66
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java": [
-96,
 144
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java": [
@@ -877,8 +874,7 @@
 157,
 165,
 173,
-183,
-193
+183
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java": [
 53,
@@ -910,10 +906,6 @@
 188,
 193
 ],
-"sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java": [
-38,
-53
-],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java": [
 176,
 256
@@ -1914,8 +1906,6 @@
 35
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/RegisterRulesTest.java": [
-285,
-320,
 355
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/rule/RuleCreatorTest.java": [
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1134.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1134.json
index ee3fee38011..3c850a0e707 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1134.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1134.json
@@ -28,9 +28,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java": [
 97
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-267
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/IndexingResult.java": [
 27
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1135.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1135.json
index 7d623a932c4..609e8db9784 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1135.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1135.json
@@ -33,9 +33,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java": [
 42
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-120
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/EsClient.java": [
 172
 ],
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-S1905.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1905.json
index 3e94dc55421..e4ccd86bd6c 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1905.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S1905.json
@@ -8,5 +8,8 @@
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java": [
 58
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/organization/ws/UpdateAction.java": [
+120
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2211.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2211.json
index 4572558577e..8de7992f91a 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2211.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2211.json
@@ -50,9 +50,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/es/NewIndex.java": [
 270
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
-137
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/favorite/ws/AddAction.java": [
 72
 ],
@@ -103,9 +100,6 @@
 237,
 287
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-112
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java": [
 195,
 226
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2260.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2260.json
new file mode 100644
index 00000000000..232bcea4ba7
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2260.json
@@ -0,0 +1,20 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java": [
+63
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java": [
+115
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
+202
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java": [
+54
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
+46
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
+57
+]
+}
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..d391357b309 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
@@ -25,12 +25,10 @@
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java": [
 173,
-201,
 219
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java": [
 230,
-258,
 276
 ],
 "sonarqube-6.5:src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java": [
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2972.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2972.json
index 4fd30496a64..a9c1886ab02 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2972.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2972.json
@@ -202,9 +202,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java": [
 107
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-253
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/EsUtils.java": [
 124,
 166
@@ -253,9 +250,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java": [
 129
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-57
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeData.java": [
 93,
 147
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2974.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2974.json
index 050b9ba22bd..1e3c837109c 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2974.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S2974.json
@@ -228,9 +228,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresQuery.java": [
 129
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-43
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java": [
 29
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3030.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3030.json
index 4e23c8db769..7d516c8012a 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3030.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3030.json
@@ -149,15 +149,9 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java": [
 46
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java": [
-29
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/NewIndex.java": [
 39
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
-36
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/favorite/ws/SearchAction.java": [
 43
 ],
@@ -221,9 +215,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java": [
 53
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-32
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentAction.java": [
 57
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3038.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3038.json
new file mode 100644
index 00000000000..c80e622d7d1
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3038.json
@@ -0,0 +1,9 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/server/ce/ws/CeWsAction.java": [
+29
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/web/RedirectFilter.java": [
+96,
+99
+]
+}
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..6750ee282fb 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,326 @@
 {
+"sonarqube-6.5:src/main/java/org/sonar/server/batch/IssuesAction.java": [
+89,
+96
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/batch/ProjectAction.java": [
+111,
+136
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ce/ws/ActivityAction.java": [
+262
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ce/ws/TaskAction.java": [
+92
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ce/ws/TaskFormatter.java": [
+78,
+114,
+139
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/ComponentDtoToWsComponent.java": [
+49,
+57,
+58,
+79
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/SearchAction.java": [
+178
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java": [
+362,
+384
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/TreeAction.java": [
+219,
+221
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentRootBuilder.java": [
+201
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java": [
+141,
+147,
+169,
+178,
+184,
+185
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java": [
+98
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java": [
+57,
+70
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java": [
+39,
+47
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java": [
+48
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java": [
+73,
+85,
+99
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java": [
+26
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java": [
+38
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java": [
+65,
+77
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java": [
+118,
+119,
+119,
+151,
+152,
+152,
+162,
+163,
+163,
+165,
+166,
+166,
+168,
+168,
+178,
+179,
+184,
+208,
+208,
+209,
+209,
+215,
+223,
+224,
+224,
+226,
+226,
+229,
+229
+],
 "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/duplication/ws/ShowResponseBuilder.java": [
+63,
+64,
+93
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/ChangelogAction.java": [
+135
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java": [
+218,
+224,
+225,
+285,
+286,
+332,
+333,
+341,
+342,
+343,
+355,
+356,
+363
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/license/ws/ListAction.java": [
+118,
+137,
+147,
+154,
+166,
+176,
+183
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentDtoToWsComponent.java": [
+44
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java": [
+243,
+314,
+316,
+322
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/MeasureDtoToWsMeasure.java": [
+50
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/SnapshotDtoToWsPeriods.java": [
+50
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/organization/ws/OrganizationsWsSupport.java": [
+107
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/organization/ws/SearchAction.java": [
+90
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/permission/PermissionTemplateService.java": [
 215
 ],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/UsersAction.java": [
+148
+],
 "sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/DeleteTemplateAction.java": [
 118
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java": [
-72
+72,
+85
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/TemplateGroupsAction.java": [
+124,
+127
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/permission/ws/template/TemplateUsersAction.java": [
+131
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/platform/ServerLogging.java": [
 60
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualitygate/ws/QualityGateDetailsFormatter.java": [
+39,
+69,
+102,
+115,
+122,
+129,
+136,
+144,
+153,
+160
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java": [
+149
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/root/ws/SearchAction.java": [
+73,
+74,
+79
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java": [
+84,
+115,
+117,
+164,
+170,
+170,
+180,
+181,
+209
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/ws/ListAction.java": [
+55
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/ws/RuleMapper.java": [
+83,
+89,
+96,
+96,
+121,
+127,
+133,
+141,
+148,
+173,
+199,
+205,
+211,
+217,
+223,
+232,
+238,
+260,
+272,
+278,
+284,
+290,
+298,
+304,
+347,
+351,
+352,
+352
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/ws/SearchAction.java": [
+395,
+396,
+424,
+426
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java": [
+125,
+147
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/setting/ws/ValuesAction.java": [
+182,
+200,
+207,
+211,
+219,
+235,
+257,
+262,
+263
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/test/index/TestResultSetIterator.java": [
+120
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java": [
+86,
+89,
+89
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/test/ws/ListAction.java": [
+147,
+155
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/user/ws/CreateAction.java": [
+136
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/user/ws/IdentityProvidersAction.java": [
+69
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/usergroups/ws/CreateAction.java": [
+106
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java": [
+159,
+160
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java": [
+131
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/usertoken/ws/SearchAction.java": [
+91
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/webhook/ws/WebhookDeliveriesAction.java": [
+133,
+134
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/webhook/ws/WebhookDeliveryAction.java": [
+105,
+106
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/webhook/ws/WebhookWsSupport.java": [
+34,
+34,
+53,
+53
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java": [
+38,
+45,
+46
 ]
 }
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3985.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3985.json
new file mode 100644
index 00000000000..24779e79406
--- /dev/null
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S3985.json
@@ -0,0 +1,217 @@
+{
+"sonarqube-6.5:src/main/java/org/sonar/ce/http/CeHttpClient.java": [
+86
+],
+"sonarqube-6.5:src/main/java/org/sonar/ce/queue/CeQueueImpl.java": [
+182,
+220
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/BaseContextFactory.java": [
+54
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java": [
+65
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/RealmAuthenticator.java": [
+151
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/authentication/SsoAuthenticator.java": [
+191
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java": [
+400
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java": [
+195
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java": [
+157,
+226
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java": [
+149
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java": [
+146
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java": [
+141,
+154
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java": [
+191,
+240
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java": [
+56
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java": [
+69
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java": [
+178
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java": [
+75,
+112,
+126
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java": [
+94,
+121
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java": [
+53
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java": [
+76,
+128
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java": [
+90
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java": [
+66
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java": [
+74,
+84,
+93
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java": [
+70
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java": [
+171
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java": [
+76,
+97
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java": [
+91,
+151
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java": [
+100
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java": [
+204,
+222,
+231
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java": [
+68
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java": [
+151,
+161,
+169
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java": [
+66
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java": [
+143
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java": [
+73
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java": [
+75
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java": [
+93
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java": [
+94
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java": [
+78
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java": [
+49
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java": [
+129
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java": [
+93
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java": [
+77
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java": [
+261
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java": [
+153
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/es/EsUtils.java": [
+124,
+166
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/license/ws/ListAction.java": [
+100
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeDataLoader.java": [
+318
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java": [
+185,
+206,
+227,
+247
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/HasMeasure.java": [
+46,
+62
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/SearchAction.java": [
+101
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/notification/NotificationService.java": [
+112
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/Platform.java": [
+365,
+396
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/platform/web/RedirectFilter.java": [
+106,
+125,
+141
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/plugins/ws/UpdateAction.java": [
+103
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/property/ws/IndexAction.java": [
+186
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java": [
+199
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/rule/RuleUpdater.java": [
+271,
+284,
+310
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/setting/ws/SettingValidations.java": [
+112
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/setting/ws/ValuesAction.java": [
+177
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java": [
+113
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/test/ws/ListAction.java": [
+247
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/user/DoPrivileged.java": [
+68
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/util/TypeValidations.java": [
+58
+]
+}
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..350a5480e7b 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
@@ -11,9 +11,6 @@
 "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
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4738.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4738.json
index 770f4c7898f..5f31d759eb0 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4738.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S4738.json
@@ -242,11 +242,6 @@
 57,
 61
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java": [
-64,
-78,
-80
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java": [
 49
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6411.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6411.json
index 7a705794d20..fc06da4f162 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6411.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6411.json
@@ -11,7 +11,9 @@
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java": [
 44,
-60
+60,
+169,
+176
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java": [
 220
@@ -22,7 +24,12 @@
 126,
 140,
 149,
-163
+163,
+178,
+191
+],
+"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java": [
+42
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java": [
 32
@@ -35,9 +42,6 @@
 43,
 54
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java": [
-47
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java": [
 48,
 117,
@@ -74,6 +78,7 @@
 102
 ],
 "sonarqube-6.5:src/main/java/org/sonar/server/rule/CachingRuleFinder.java": [
+59,
 61,
 75,
 79
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6548.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6548.json
index b1403a4cbfd..6c839273f30 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6548.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S6548.json
@@ -100,9 +100,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java": [
 261
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/BulkIndexer.java": [
-227
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/issue/IssuesFinderSort.java": [
 183
 ],
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S818.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S818.json
index 93678926a79..b80856f6960 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S818.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S818.json
@@ -61,15 +61,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/es/IndexingResult.java": [
 69
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRepertoire.java": [
-52,
-63,
-76,
-87,
-98,
-108,
-118
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java": [
 92
 ],
@@ -96,13 +87,6 @@
 272,
 273
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/measure/index/ProjectsTextSearchQueryFactory.java": [
-63,
-70,
-78,
-89,
-96
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/measure/ws/MeasureValueFormatter.java": [
 28,
 89
diff --git a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S923.json b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S923.json
index 4bee32f04e0..aa7bc3dda26 100644
--- a/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S923.json
+++ b/its/ruling/src/test/resources/expected/sonarqube-6.5/java-S923.json
@@ -31,11 +31,6 @@
 "sonarqube-6.5:src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java": [
 63
 ],
-"sonarqube-6.5:src/main/java/org/sonar/server/es/DefaultIndexSettingsElement.java": [
-311,
-315,
-323
-],
 "sonarqube-6.5:src/main/java/org/sonar/server/es/EsClient.java": [
 85,
 89,