summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2015-09-30 17:28:09 +0200
committerDuarte Meneses <duarte.meneses@sonarsource.com>2015-10-01 11:17:33 +0200
commit30c7468d640713d2639ee7c4dbc10bb7a482ce64 (patch)
treeb03546e7406f7795a69f6b7f8f7e7fa2fdd50cea
parentbbec253bcd6cc8865c7d5aa31bd59ca8ff06ce29 (diff)
downloadsonar-scanner-cli-30c7468d640713d2639ee7c4dbc10bb7a482ce64.tar.gz
sonar-scanner-cli-30c7468d640713d2639ee7c4dbc10bb7a482ce64.zip
Dont use server version in cache keys
-rw-r--r--sonar-runner-api/src/main/java/org/sonar/runner/impl/IsolatedLauncherFactory.java2
-rw-r--r--sonar-runner-api/src/test/java/org/sonar/runner/impl/ServerConnectionTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-runner-api/src/main/java/org/sonar/runner/impl/IsolatedLauncherFactory.java b/sonar-runner-api/src/main/java/org/sonar/runner/impl/IsolatedLauncherFactory.java
index 59d416c..e3bf2c8 100644
--- a/sonar-runner-api/src/main/java/org/sonar/runner/impl/IsolatedLauncherFactory.java
+++ b/sonar-runner-api/src/main/java/org/sonar/runner/impl/IsolatedLauncherFactory.java
@@ -55,7 +55,7 @@ public class IsolatedLauncherFactory {
String serverUrl = props.getProperty("sonar.host.url");
String home = props.getProperty("sonar.userHome");
- builder.setAreaForGlobal(serverUrl, null);
+ builder.setAreaForGlobal(serverUrl);
if (home != null) {
builder.setSonarHome(Paths.get(home));
}
diff --git a/sonar-runner-api/src/test/java/org/sonar/runner/impl/ServerConnectionTest.java b/sonar-runner-api/src/test/java/org/sonar/runner/impl/ServerConnectionTest.java
index db9e814..fe6069f 100644
--- a/sonar-runner-api/src/test/java/org/sonar/runner/impl/ServerConnectionTest.java
+++ b/sonar-runner-api/src/test/java/org/sonar/runner/impl/ServerConnectionTest.java
@@ -59,7 +59,7 @@ public class ServerConnectionTest {
@Before
public void setUp() {
cache = new PersistentCacheBuilder(mock(Logger.class))
- .setAreaForGlobal("server", "5.2")
+ .setAreaForGlobal("server")
.setSonarHome(temp.getRoot().toPath())
.build();
logger = mock(Logger.class);