7 files changed, 11 insertions, 7 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java
index 8ae64fb5672..6e4d7b51f09 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java
@@ -19,8 +19,9 @@
  */
 package org.sonar.api.measures;
 
+import org.sonar.api.task.TaskComponent;
+
 import org.sonar.api.ServerComponent;
-import org.sonar.api.TaskComponent;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java
index 4ce4bf1d2f7..42e7b34b262 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java
@@ -19,8 +19,9 @@
  */
 package org.sonar.api.rules;
 
+import org.sonar.api.task.TaskComponent;
+
 import org.sonar.api.ServerComponent;
-import org.sonar.api.TaskComponent;
 
 import java.util.Collection;
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java
index 1f112f8f5cf..42bfdddcaac 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.api.task;
 
-import org.sonar.api.TaskExtension;
 
 /**
  * Implement this interface to provide the behavior of a task.
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/TaskComponent.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java
index 9355625a708..346b8bcf351 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/TaskComponent.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java
@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.api;
+package org.sonar.api.task;
 
 /**
  * Dependency Injection : all the classes implementing this interface are available in the task IoC container.
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
index 75f48b670b0..897831cc914 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.api.task;
 
-import org.sonar.api.TaskDefinitionExtension;
 
 /**
  * Implement this interface to provide a new task.
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/TaskDefinitionExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinitionExtension.java
index a01ef69b509..0bf358384f1 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/TaskDefinitionExtension.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinitionExtension.java
@@ -17,7 +17,9 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.api;
+package org.sonar.api.task;
+
+import org.sonar.api.Extension;
 
 /**
  * Task definition extension point.
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/TaskExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java
index 4da612ec234..92c3c7230de 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/TaskExtension.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java
@@ -17,7 +17,9 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.api;
+package org.sonar.api.task;
+
+import org.sonar.api.Extension;
 
 /**
  * Task extension point.