Dont use server version in global cache keys

1 files changed, 6 insertions, 4 deletions

diff --git a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
index 2097832853b..7be8fae66e8 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
@@ -49,20 +49,22 @@ public class PersistentCacheBuilder {
   }
 
   public PersistentCacheBuilder setAreaForProject(String serverUrl, String serverVersion, String projectKey) {
-    relativePath = Paths.get(sanitizeFilename(serverUrl + "-" + serverVersion))
+    relativePath = Paths.get(sanitizeFilename(serverUrl))
+      .resolve(sanitizeFilename(serverVersion))
       .resolve("projects")
       .resolve(sanitizeFilename(projectKey));
     return this;
   }
   
-  public PersistentCacheBuilder setAreaForGlobal(String serverUrl, String serverVersion) {
-    relativePath = Paths.get(sanitizeFilename(serverUrl + "-" + serverVersion))
+  public PersistentCacheBuilder setAreaForGlobal(String serverUrl) {
+    relativePath = Paths.get(sanitizeFilename(serverUrl))
       .resolve("global");
     return this;
   }
   
   public PersistentCacheBuilder setAreaForLocalProject(String serverUrl, String serverVersion) {
-    relativePath = Paths.get(sanitizeFilename(serverUrl + "-" + serverVersion))
+    relativePath = Paths.get(sanitizeFilename(serverUrl))
+      .resolve(sanitizeFilename(serverVersion))
       .resolve("local");
     return this;
   }