SONAR-10591 scanner uses WS api/plugins/download

SonarSource · May 11, 2018 · 01e1c69 · 01e1c69
1 parent 54a47fb
commit 01e1c69
Show file tree

Hide file tree

Showing 24 changed files with 841 additions and 579 deletions.
diff --git a/sonar-core/src/main/java/org/sonar/core/platform/RemotePlugin.java b/sonar-core/src/main/java/org/sonar/core/platform/RemotePlugin.java
diff --git a/sonar-core/src/test/java/org/sonar/core/platform/RemotePluginTest.java b/sonar-core/src/test/java/org/sonar/core/platform/RemotePluginTest.java
diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
@@ -36,6 +36,7 @@ dependencies {
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
+  testCompile 'com.squareup.okhttp3:mockwebserver'
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'javax.servlet:javax.servlet-api'
   testCompile 'junit:junit'

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/FileCacheProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/FileCacheProvider.java
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java
@@ -93,7 +93,7 @@ private void addBootstrapComponents() {
       new GlobalTempFolderProvider(),
       DefaultHttpDownloader.class,
       UriReader.class,
-      new FileCacheProvider(),
+      PluginFiles.class,
       System2.INSTANCE,
       Clock.systemDefaultZone(),
       new MetricsRepositoryProvider(),