remove all other dependencies onto sonar-server

was causing funky dependency tree for tests (almost loop)
dependency was sometimes added for transitive dependencies
module was super large yet hardly a couple classes were used

2 files changed, 5 insertions, 6 deletions

diff --git a/sonar-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle
index 274ca7ea96c..ee9930a295d 100644
--- a/sonar-plugin-api-impl/build.gradle
+++ b/sonar-plugin-api-impl/build.gradle
@@ -17,13 +17,13 @@ dependencies {
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly 'junit:junit'
 
-  testCompile 'junit:junit'
-  testCompile 'com.google.code.findbugs:jsr305'
+  testCompileOnly 'com.google.code.findbugs:jsr305'
 
+  testCompile 'com.google.guava:guava'
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.mockito:mockito-core'
-  testCompile project(':server:sonar-server')
 }
 
 artifactoryPublish.skip = false
diff --git a/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java b/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java
index b21d2077ebb..eadf5e8a272 100644
--- a/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java
+++ b/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java
@@ -27,7 +27,6 @@ import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.server.util.TempFolderCleaner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -51,7 +50,7 @@ public class DefaultTempFolderTest {
     File file = underTest.newFile();
     assertThat(file).exists().isFile();
 
-    new TempFolderCleaner(underTest).stop();
+    underTest.clean();
     assertThat(rootTempFolder).doesNotExist();
   }
 
@@ -63,7 +62,7 @@ public class DefaultTempFolderTest {
     assertThat(dir).exists().isDirectory();
     assertThat(new File(rootTempFolder, "sample")).isEqualTo(dir);
 
-    new TempFolderCleaner(underTest).stop();
+    underTest.clean();
     assertThat(rootTempFolder).doesNotExist();
   }