Automatic merge from branch-5.0

* origin/branch-5.0:
  Deprecate SCM metrics for later removall
  SONAR-5962 The size of the analysis reports queue is wrong

2 files changed, 14 insertions, 3 deletions

diff --git a/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee b/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee
index 237485c18e6..12608b30d87 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee
@@ -31,4 +31,4 @@ define [
     serializeData: ->
       _.extend super,
         state: @options.app.state.toJSON()
-        total: @collection.paging.total || 0
+        total: @collection.paging.total || @collection.length
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
index 975370c1b1f..1f1b35c080c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
@@ -27,6 +27,7 @@ import org.sonar.api.resources.Scopes;
 import org.sonar.api.utils.SonarException;
 
 import javax.annotation.Nullable;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.List;
@@ -1884,13 +1885,14 @@ public final class CoreMetrics {
   // --------------------------------------------------------------------------------------------------------------------
   //
   // SCM
-  // These metrics are computed by the SCM Activity plugin, since version 1.2 and introduced here since version 2.7.
   //
   // --------------------------------------------------------------------------------------------------------------------
 
   /**
    * @since 2.7
+   * @deprecated since 5.0 SCM data will no more be stored as measures
    */
+  @Deprecated
   public static final String SCM_AUTHORS_BY_LINE_KEY = "authors_by_line";
 
   /**
@@ -1899,14 +1901,18 @@ public final class CoreMetrics {
    * @see org.sonar.api.utils.KeyValueFormat#formatIntString(java.util.Map)
    * @see org.sonar.api.utils.KeyValueFormat#parseIntString(String)
    * @since 2.7
+   * @deprecated since 5.0 SCM data will no more be stored as measures
    */
+  @Deprecated
   public static final Metric<String> SCM_AUTHORS_BY_LINE = new Metric.Builder(SCM_AUTHORS_BY_LINE_KEY, "Authors by line", Metric.ValueType.DATA)
     .setDomain(DOMAIN_SCM)
     .create();
 
   /**
    * @since 2.7
+   * @deprecated since 5.0 SCM data will no more be stored as measures
    */
+  @Deprecated
   public static final String SCM_REVISIONS_BY_LINE_KEY = "revisions_by_line";
 
   /**
@@ -1915,14 +1921,18 @@ public final class CoreMetrics {
    * @see org.sonar.api.utils.KeyValueFormat#formatIntString(java.util.Map)
    * @see org.sonar.api.utils.KeyValueFormat#parseIntString(String)
    * @since 2.7
+   * @deprecated since 5.0 SCM data will no more be stored as measures
    */
+  @Deprecated
   public static final Metric<String> SCM_REVISIONS_BY_LINE = new Metric.Builder(SCM_REVISIONS_BY_LINE_KEY, "Revisions by line", Metric.ValueType.DATA)
     .setDomain(DOMAIN_SCM)
     .create();
 
   /**
    * @since 2.7
+   * @deprecated since 5.0 SCM data will no more be stored as measures
    */
+  @Deprecated
   public static final String SCM_LAST_COMMIT_DATETIMES_BY_LINE_KEY = "last_commit_datetimes_by_line";
 
   /**
@@ -1931,13 +1941,14 @@ public final class CoreMetrics {
    * @see org.sonar.api.utils.KeyValueFormat#formatIntDateTime(java.util.Map)
    * @see org.sonar.api.utils.KeyValueFormat#parseIntDateTime(String)
    * @since 2.7
+   * @deprecated since 5.0 SCM data will no more be stored as measures
    */
+  @Deprecated
   public static final Metric<String> SCM_LAST_COMMIT_DATETIMES_BY_LINE = new Metric.Builder(SCM_LAST_COMMIT_DATETIMES_BY_LINE_KEY, "Last commit dates by line",
     Metric.ValueType.DATA)
     .setDomain(DOMAIN_SCM)
     .create();
 
-
   // --------------------------------------------------------------------------------------------------------------------
   //
   // TECHNICAL DEBT