Fix deprecated DecoratorBarriers

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
index 2469e4cd8787be030b151e01e7dc1eb4ccc7e8d5..73bf0c728b8d2d308bcefb3c682e53fce57e8ed6 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
@@ -43,8 +43,8 @@ import org.sonar.core.issue.workflow.IssueWorkflow;
 
 import java.util.Collection;
 
-@DependsUpon(DecoratorBarriers.ISSUES_ADDED)
-@DependedUpon(DecoratorBarriers.ISSUES_TRACKED)
+@DependsUpon({DecoratorBarriers.ISSUES_ADDED, DecoratorBarriers.END_OF_VIOLATIONS_GENERATION})
+@DependedUpon({DecoratorBarriers.ISSUES_TRACKED, DecoratorBarriers.END_OF_VIOLATION_TRACKING})
 public class IssueTrackingDecorator implements Decorator {
 
   private final IssueCache issueCache;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/DecoratorBarriers.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/DecoratorBarriers.java
index 5bfbeed5c15bb041a5a7d3fe45763d14ea7eb2f4..4bcf13e30b8fbf4b0e39a30a2ad3ae1e4016be95 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/DecoratorBarriers.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/DecoratorBarriers.java
@@ -65,7 +65,7 @@ public interface DecoratorBarriers {
    * @deprecated in 3.6. Replaced by {@link #ISSUES_ADDED}
    */
   @Deprecated
-  String END_OF_VIOLATIONS_GENERATION = ISSUES_ADDED;
+  String END_OF_VIOLATIONS_GENERATION = "END_OF_VIOLATIONS_GENERATION";
 
   /**
    * Extensions which call the method {@code Violation#setSwitchedOff} must be executed before this barrier
@@ -92,7 +92,7 @@ public interface DecoratorBarriers {
    * @deprecated in 3.6. Replaced by {@link #ISSUES_TRACKED}
    */
   @Deprecated
-  String END_OF_VIOLATION_TRACKING = ISSUES_TRACKED;
+  String END_OF_VIOLATION_TRACKING = "END_OF_VIOLATION_TRACKING";
 
   /**
    * @since 2.13