Cut dependency between sonar-core and sonar-home

diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index 4a7ae54ef7773eb71537a19ddcdaeafe78e9ed16..7738b4d2a93fe4d02f92cce5361f77a1e6938633 100644 (file)
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -43,10 +43,6 @@
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-update-center-common</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-home</artifactId>
-    </dependency>
 
     <!-- logging -->
     <dependency>

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
index 65e9d683cb50117dc00d5c33ec7bd230ae0e854a..d7e24418de4829d3a0b55d8b7cb5f76161d2cbea 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/platform/RemotePlugin.java
+++ b/sonar-core/src/main/java/org/sonar/core/platform/RemotePlugin.java
@@ -20,8 +20,10 @@
 package org.sonar.core.platform;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.home.cache.FileHashes;
 
 public class RemotePlugin {
   private String pluginKey;
@@ -64,7 +66,11 @@ public class RemotePlugin {
   }
 
   public RemotePlugin setFile(File f) {
-    return this.setFile(f.getName(), new FileHashes().of(f));
+    try (FileInputStream fis = new FileInputStream(f)) {
+      return this.setFile(f.getName(), DigestUtils.md5Hex(fis));
+    } catch (IOException e) {
+      throw new IllegalStateException("Fail to compute hash", e);
+    }
   }
 
   public RemotePluginFile file() {