Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
	sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
	sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
	sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java
	sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java

diff --cc sonar-batch/src/main/java/org/sonar/batch/DefaultSensorContext.java
Simple merge

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
Simple merge

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java
Simple merge

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
index da86bc689c0c292c9d3f794d8be6c94ede79f68d,38c6b180f07c5d30be3c19467fb175955457211e..0955f4d1ba3fc8053783696edc2ecb54842b795f
--- 1/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
--- 2/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
@@@ -19,9 -19,10 +19,13 @@@
   */
  package org.sonar.colorizer;
  
 +import javax.annotation.CheckForNull;
 +import javax.annotation.Nullable;
 +
+ /**
+  * @deprecated since 4.5.2 replace by highlighting mechanism
+  */
+ @Deprecated
  public class HtmlOptions {
    public static final HtmlOptions DEFAULT = new HtmlOptions(true, null, true);
    public static final OnlySyntaxHtmlOptions ONLY_SYNTAX = new OnlySyntaxHtmlOptions();

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java
Simple merge

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java
Simple merge

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java
Simple merge

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
index 6a1007d5e73ad051b55f5ab1b5b6dad9b755efb1,054a74efe57d43e1fdc1e2458a97677efe7f0122..ed5bacda9da15967954e2e68137d1a0161f28a19
--- 1/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
--- 2/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
+++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
@@@ -61,10 -65,9 +65,10 @@@ public class LiteralTokenizer extends T
        literalValue = new StringBuilder();
      }
  
 +    @Override
      public boolean match(int endFlag) {
        literalValue.append((char) endFlag);
-       return code.lastChar()==firstChar && evenNumberOfBackSlashBeforeDelimiter() && literalValue.length()>1;
+       return code.lastChar() == firstChar && evenNumberOfBackSlashBeforeDelimiter() && literalValue.length() > 1;
      }
  
      private boolean evenNumberOfBackSlashBeforeDelimiter() {

diff --cc sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java
Simple merge

diff --cc sonar-core/src/main/java/org/sonar/core/component/ScanPerspectives.java
Simple merge

diff --cc sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
index b03cc779119857fc5e1407ea19f42b6210592640,39124edb2ab0774a032874f4397d48c9eaf292c9..d230420b20e8b4c43b55c38d90a3b870602fa116
--- 1/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
--- 2/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
@@@ -38,7 -37,7 +38,7 @@@ import java.util.List
  import java.util.Set;
  
  /**
-  * @deprecated since 5.0 should not be an API. Everything should be accessed using {@link SensorContext}.
 - * @deprecated since 4.5.2 should not be used by plugins.
++ * @deprecated since 4.5.2 should not be used by plugins. Everything should be accessed using {@link SensorContext}.
   */
  @Deprecated
  public abstract class SonarIndex implements DirectedGraphAccessor<Resource, Dependency> {

diff --cc sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
Simple merge

diff --cc sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
index bb6903569c9911b46ed9199660440fe7e6ce2d74,4c6c32a278a50ff37efbf4c8f5e72e4089e7dd38..ac32a3bf48d15c6a8a16b143977cbe3c44fdb84a
--- 1/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
--- 2/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
@@@ -28,13 -27,13 +27,13 @@@ import org.sonar.colorizer.Tokenizer
  import java.util.List;
  
  /**
 - * Extend the library sonar-colorizer to support new languages. By default only Java sources are colorized in Sonar.
 + * Extend the library sonar-colorizer to support new languages.
   * 
   * @since 1.12
-  * @deprecated since 5.0 use {@link Highlightable} API
 - * @deprecated since 4.5.2 use {@link Highlightable}
++ * @deprecated since 4.5.2 use {@link Highlightable} API
   */
  @Deprecated
- public abstract class CodeColorizerFormat implements ServerExtension, TaskExtension {
+ public abstract class CodeColorizerFormat implements ServerExtension {
  
    private String languageKey;