SONAR-5377 Update update center library to 1.11

3 files changed, 10 insertions, 5 deletions

diff --git a/pom.xml b/pom.xml
index 77863d16a78..a97439924de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
   </prerequisites>
 
   <properties>
-    <sonarUpdateCenter.version>1.8</sonarUpdateCenter.version>
+    <sonarUpdateCenter.version>1.11</sonarUpdateCenter.version>
     <sonarJava.version>2.2.1</sonarJava.version>
     <h2.version>1.3.172</h2.version>
     <jetty.version>8.1.12.v20130726</jetty.version>
diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
index e1374abdee0..7af55f4a1f5 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
@@ -29,13 +29,13 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.utils.UriReader;
 import org.sonar.updatecenter.common.UpdateCenter;
 import org.sonar.updatecenter.common.UpdateCenterDeserializer;
+import org.sonar.updatecenter.common.UpdateCenterDeserializer.Mode;
 
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Date;
 
-
 /**
  * HTTP client to load data from the remote update center hosted at http://update.sonarsource.org.
  *
@@ -103,7 +103,7 @@ public class UpdateCenterClient {
       java.util.Properties properties = new java.util.Properties();
       input = IOUtils.toInputStream(content, Charsets.UTF_8.name());
       properties.load(input);
-      return UpdateCenterDeserializer.fromProperties(properties);
+      return new UpdateCenterDeserializer(Mode.PROD, true).fromProperties(properties);
 
     } catch (Exception e) {
       LoggerFactory.getLogger(getClass()).error("Fail to connect to update center", e);
diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
index 6fea8423a4c..d8a1f2e7904 100644
--- a/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
@@ -32,7 +32,12 @@ import java.net.URI;
 import java.net.URISyntaxException;
 
 import static org.fest.assertions.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class UpdateCenterClientTest {
 
@@ -49,7 +54,7 @@ public class UpdateCenterClientTest {
 
   @Test
   public void downloadUpdateCenter() throws URISyntaxException {
-    when(reader.readString(new URI(BASE_URL), Charsets.UTF_8)).thenReturn("sonar.versions=2.2,2.3");
+    when(reader.readString(new URI(BASE_URL), Charsets.UTF_8)).thenReturn("publicVersions=2.2,2.3");
     UpdateCenter plugins = client.getUpdateCenter();
     verify(reader, times(1)).readString(new URI(BASE_URL), Charsets.UTF_8);
     assertThat(plugins.getSonar().getVersions()).containsOnly(Version.create("2.2"), Version.create("2.3"));