SONAR-4069 Move task related interface in task package

12 files changed, 22 insertions, 13 deletions

diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PeriodCleaner.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PeriodCleaner.java
index 6dbef4fa92d..44c02d9a503 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PeriodCleaner.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PeriodCleaner.java
@@ -19,7 +19,8 @@
  */
 package org.sonar.plugins.dbcleaner.api;
 
-import org.sonar.api.TaskExtension;
+import org.sonar.api.task.TaskExtension;
+
 import org.sonar.api.resources.Project;
 
 /**
diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java
index af54168486e..bb0ffadf773 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/api/PurgeTask.java
@@ -19,8 +19,9 @@
  */
 package org.sonar.plugins.dbcleaner.api;
 
+import org.sonar.api.task.TaskExtension;
+
 import com.google.common.annotations.Beta;
-import org.sonar.api.TaskExtension;
 
 /**
  * @since 2.14
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
index aaf50e54f0a..12c104f03bb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
@@ -19,11 +19,12 @@
  */
 package org.sonar.batch.bootstrap;
 
+import org.sonar.api.task.TaskDefinitionExtension;
+import org.sonar.api.task.TaskExtension;
+
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.BatchExtension;
 import org.sonar.api.Extension;
-import org.sonar.api.TaskDefinitionExtension;
-import org.sonar.api.TaskExtension;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.batch.SupportedEnvironment;
 import org.sonar.api.task.RequiresProject;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
index 0cf3af16bc2..29807361e1a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
@@ -19,10 +19,11 @@
  */
 package org.sonar.batch.bootstrap;
 
+import org.sonar.api.task.TaskExtension;
+
 import com.google.common.collect.Lists;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.ExtensionProvider;
-import org.sonar.api.TaskExtension;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
index 4cd50965e29..5310b175f30 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
@@ -19,12 +19,13 @@
  */
 package org.sonar.batch.bootstrap;
 
+import org.sonar.api.task.TaskComponent;
+
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.TaskComponent;
 import org.sonar.api.batch.bootstrap.ProjectBuilder;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
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.