Merge branch 'release-3.0'

14 files changed, 29 insertions, 23 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
index 4899dd09e38..7209d584830 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
@@ -28,7 +28,7 @@ package org.sonar.api;
 public interface CoreProperties {
 
   /**
-   * @since 2.15
+   * @since 3.0
    */
   String ENCRYPTION_SECRET_KEY_PATH = "sonar.secretKeyPath";
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Property.java b/sonar-plugin-api/src/main/java/org/sonar/api/Property.java
index c7820f15d3d..9348402227d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/Property.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/Property.java
@@ -78,14 +78,14 @@ public @interface Property {
   boolean global() default true;
 
   /**
-   * @since 2.15
+   * @since 3.0
    */
   PropertyType type() default PropertyType.STRING;
 
   /**
    * Options for *_LIST types
    *
-   * @since 2.15
+   * @since 3.0
    */
   String[] options() default {};
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/PropertyType.java b/sonar-plugin-api/src/main/java/org/sonar/api/PropertyType.java
index aacf82cd1ce..6e0a40ea088 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/PropertyType.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/PropertyType.java
@@ -20,7 +20,7 @@
 package org.sonar.api;
 
 /**
- * @since 2.15
+ * @since 3.0
  */
 public enum PropertyType {
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/Encryption.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/Encryption.java
index 3857fc276ed..d3d099b38ff 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/Encryption.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/Encryption.java
@@ -27,7 +27,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * @since 2.15
+ * @since 3.0
  */
 public final class Encryption {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/GlobalPropertyChangeHandler.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/GlobalPropertyChangeHandler.java
index f7a3a7bb607..e0a4c79e36c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/GlobalPropertyChangeHandler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/GlobalPropertyChangeHandler.java
@@ -30,7 +30,7 @@ import javax.annotation.Nullable;
  * <li>changes done programmatically on the component org.sonar.api.config.Settings</li>
  * </ul>
  *
- * @since 2.15
+ * @since 3.0
  */
 public abstract class GlobalPropertyChangeHandler implements ServerExtension {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/License.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/License.java
index 93a22713ead..384962e5e28 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/License.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/License.java
@@ -38,7 +38,7 @@ import java.util.Map;
  * SonarSource license. This class aims to extract metadata but not to validate or - of course -
  * to generate license
  *
- * @since 2.15
+ * @since 3.0
  */
 public final class License {
   private String product;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
index 83e56623f1b..2e4b646429c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
@@ -28,7 +28,7 @@ import org.sonar.api.PropertyType;
 import javax.annotation.Nullable;
 
 /**
- * @since 2.15
+ * @since 3.0
  */
 public final class PropertyDefinition {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageComplexityFormula.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageComplexityFormula.java
index 3a22d656741..b3f7233f385 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageComplexityFormula.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageComplexityFormula.java
@@ -24,7 +24,7 @@ package org.sonar.api.measures;
  * Compute complexity by 'X', where 'X' can be any metric, like "file" for instance. 
  * 
  * @since 2.1
- * @deprecated since 2.15. Use {@link AverageFormula} instead.
+ * @deprecated since 3.0. Use {@link AverageFormula} instead.
  */
 @Deprecated
 public class AverageComplexityFormula extends AverageFormula {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
index a22824e533d..d9f04ee3604 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
@@ -30,7 +30,7 @@ import java.util.List;
  * <p/>
  * For example: to compute the metric "complexity by file", the main metric (A) is "complexity" and the other metric (B) is "file".
  *
- * @since 2.15
+ * @since 3.0
  */
 public class AverageFormula implements Formula {
 
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 c8a1af87734..ca742701dec 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
@@ -184,12 +184,12 @@ public final class CoreMetrics {
       .create();
 
   /**
-   * @since 2.15
+   * @since 3.0
    */
   public static final String PROJECTS_KEY = "projects";
 
   /**
-   * @since 2.15
+   * @since 3.0
    */
   public static final Metric PROJECTS = new Metric.Builder(PROJECTS_KEY, "Projects", Metric.ValueType.INT)
       .setDescription("Number of projects")
@@ -328,13 +328,13 @@ public final class CoreMetrics {
       .create();
 
   /**
-   * @deprecated in 2.15 - see SONAR-3289
+   * @deprecated in 3.0 - see SONAR-3289
    */
   @Deprecated
   public static final String CLASS_COMPLEXITY_DISTRIBUTION_KEY = "class_complexity_distribution";
 
   /**
-   * @deprecated in 2.15 - see SONAR-3289
+   * @deprecated in 3.0 - see SONAR-3289
    */
   @Deprecated
   public static final Metric CLASS_COMPLEXITY_DISTRIBUTION = new Metric.Builder(CLASS_COMPLEXITY_DISTRIBUTION_KEY, "Classes distribution /complexity", Metric.ValueType.DISTRIB)
@@ -1396,6 +1396,7 @@ public final class CoreMetrics {
       .setDirection(Metric.DIRECTION_WORST)
       .setQualitative(true)
       .setDomain(DOMAIN_DESIGN)
+      .setBestValue(0.0)
       .setFormula(new SumChildValuesFormula(false))
       .create();
 
@@ -1404,6 +1405,7 @@ public final class CoreMetrics {
       .setDescription("Package tangle index")
       .setDirection(Metric.DIRECTION_WORST)
       .setQualitative(true)
+      .setBestValue(0.0)
       .setDomain(DOMAIN_DESIGN)
       .create();
 
@@ -1423,6 +1425,7 @@ public final class CoreMetrics {
       .setQualitative(false)
       .setDomain(DOMAIN_DESIGN)
       .setFormula(new SumChildValuesFormula(false))
+      .setBestValue(0.0)
       .create();
 
   public static final String PACKAGE_EDGES_WEIGHT_KEY = "package_edges_weight";
@@ -1444,6 +1447,7 @@ public final class CoreMetrics {
       .setDomain(DOMAIN_DESIGN)
       .setHidden(true)
       .setDeleteHistoricalData(true)
+      .setBestValue(0.0)
       .create();
 
   public static final String FILE_TANGLE_INDEX_KEY = "file_tangle_index";
@@ -1454,6 +1458,7 @@ public final class CoreMetrics {
       .setDomain(DOMAIN_DESIGN)
       .setHidden(true)
       .setDeleteHistoricalData(true)
+      .setBestValue(0.0)
       .create();
 
   public static final String FILE_TANGLES_KEY = "file_tangles";
@@ -1474,6 +1479,7 @@ public final class CoreMetrics {
       .setDomain(DOMAIN_DESIGN)
       .setHidden(true)
       .setDeleteHistoricalData(true)
+      .setBestValue(0.0)
       .create();
 
   public static final String FILE_EDGES_WEIGHT_KEY = "file_edges_weight";
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
index 29cbb2287dd..368e9f0e249 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
@@ -32,7 +32,7 @@ import com.google.common.collect.Maps;
 /**
  * <p>Experimental extension to declare types of resources.</p>
  * <p>
- * Since 2.15, ResourceType object can declare properties that give information about the capabilities of the
+ * Since 3.0, ResourceType object can declare properties that give information about the capabilities of the
  * resource type. Those properties may be used, of instance, to adapt the Web UI according to the type of 
  * the resource being displayed.
  * <br>
@@ -78,7 +78,7 @@ public final class ResourceType {
     }
 
     /**
-     * @deprecated since 2.15. Use {@link #setProperty(String, String)} with "availableForFilters" set to "true".
+     * @deprecated since 3.0. Use {@link #setProperty(String, String)} with "availableForFilters" set to "true".
      */
     @Deprecated
     public Builder availableForFilters() {
@@ -97,7 +97,7 @@ public final class ResourceType {
     /**
      * Sets a property on the resource type. See the description of {@link ResourceType} class for more information.
      * 
-     * @since 2.15
+     * @since 3.0
      */
     public Builder setProperty(String key, String value) {
       Preconditions.checkNotNull(key);
@@ -158,7 +158,7 @@ public final class ResourceType {
   }
 
   /**
-   * @deprecated since 2.15. Use {@link #getBooleanProperty(String)} with "availableForFilters".
+   * @deprecated since 3.0. Use {@link #getBooleanProperty(String)} with "availableForFilters".
    */
   @Deprecated
   public boolean isAvailableForFilters() {
@@ -179,7 +179,7 @@ public final class ResourceType {
    * Returns the value of the property for this resource type.
    * 
    * @return the String value of the property, or NULL if the property hasn't been set.
-   * @since 2.15
+   * @since 3.0
    */
   public String getStringProperty(String key) {
     Preconditions.checkNotNull(key);
@@ -190,7 +190,7 @@ public final class ResourceType {
    * Returns the value of the property for this resource type.
    * 
    * @return the Boolean value of the property. If the property hasn't been set, False is returned.
-   * @since 2.15
+   * @since 3.0
    */
   public Boolean getBooleanProperty(String key) {
     Preconditions.checkNotNull(key);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
index 90c72c881f6..9b156ffa640 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
@@ -73,7 +73,7 @@ public final class DateUtils {
    *
    * @param s any string
    * @return the date, null if parsing error or null string
-   * @since 2.15
+   * @since 3.0
    */
   public static Date parseDateQuietly(@Nullable String s) {
     Date date = null;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
index 214674029c3..3ce60a6f315 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
@@ -51,7 +51,7 @@ public final class CommandExecutor {
 
   /**
    * @throws CommandException
-   * @since 2.15
+   * @since 3.0
    */
   public int execute(Command command, StreamConsumer stdOut, StreamConsumer stdErr, long timeoutMilliseconds) {
     ExecutorService executorService = null;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/RequiredMeasures.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/RequiredMeasures.java
index b94ae3098ff..329b5a3bfe4 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/RequiredMeasures.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/RequiredMeasures.java
@@ -35,7 +35,7 @@ import java.lang.annotation.Target;
  * The class will define a <code>@RequiredMeasures(allOf={"dsm"})</code> annotation.
  * </p>
  * 
- * @since 2.15
+ * @since 3.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)