SONAR-6517 remove dependency of sonar-plugin-api on picocontainer

4 files changed, 18 insertions, 5 deletions

diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index ea0fd0be8f8..1fb4e03daf2 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -20,6 +20,10 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.picocontainer</groupId>
+      <artifactId>picocontainer</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-classloader</artifactId>
     </dependency>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 039aba7b84a..2e37e8f3498 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -63,6 +63,10 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.picocontainer</groupId>
+          <artifactId>picocontainer</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java
index 26e5c74f180..2cc8c26107c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java
@@ -20,9 +20,9 @@
 
 package org.sonar.api.technicaldebt.batch.internal;
 
+import javax.annotation.Nullable;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.picocontainer.annotations.Nullable;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.technicaldebt.batch.Requirement;
 import org.sonar.api.utils.WorkUnit;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java
index 8ba70571379..205cc642ac4 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/TempFolderCleaner.java
@@ -19,14 +19,13 @@
  */
 package org.sonar.api.utils.internal;
 
-import org.picocontainer.Startable;
 import org.sonar.api.BatchSide;
 import org.sonar.api.ServerSide;
 import org.sonar.api.utils.TempFolder;
 
 @BatchSide
 @ServerSide
-public class TempFolderCleaner implements Startable {
+public class TempFolderCleaner {
 
   private TempFolder defaultTempFolder;
 
@@ -34,12 +33,18 @@ public class TempFolderCleaner implements Startable {
     this.defaultTempFolder = defaultTempFolder;
   }
 
-  @Override
+  /**
+   * This method should not be renamed. It follows the naming convention
+   * defined by IoC container.
+   */
   public void start() {
     // Nothing to do
   }
 
-  @Override
+  /**
+   * This method should not be renamed. It follows the naming convention
+   * defined by IoC container.
+   */
   public void stop() {
     ((DefaultTempFolder) defaultTempFolder).clean();
   }