SONAR-7884 update default Update Center URL to HTTPS

diff --git a/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
index 583c4c45f1fb761a666fa2da71e1a7f7a0d0166c..a8e1e222eb7fe6d6076f6a6a68668e8b9890819f 100644 (file)
--- a/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
+++ b/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
@@ -116,7 +116,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
 #--------------------------------------------------------------------------------------------------
 # UPDATE CENTER
 
-# The Update Center requires an internet connection to request http://update.sonarsource.org
+# The Update Center requires an internet connection to request https://update.sonarsource.org
 # It is enabled by default.
 #sonar.updatecenter.activate=true
 

diff --git a/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
index 583c4c45f1fb761a666fa2da71e1a7f7a0d0166c..a8e1e222eb7fe6d6076f6a6a68668e8b9890819f 100644 (file)
--- a/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
+++ b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
@@ -116,7 +116,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
 #--------------------------------------------------------------------------------------------------
 # UPDATE CENTER
 
-# The Update Center requires an internet connection to request http://update.sonarsource.org
+# The Update Center requires an internet connection to request https://update.sonarsource.org
 # It is enabled by default.
 #sonar.updatecenter.activate=true
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
index cd6c52330908d042ecc2d803bf50ea20dfa91f9e..5057bad35f6b70329f186a760e11ff10e36541c0 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
@@ -37,7 +37,7 @@ import org.sonar.updatecenter.common.UpdateCenterDeserializer;
 import org.sonar.updatecenter.common.UpdateCenterDeserializer.Mode;
 
 /**
- * HTTP client to load data from the remote update center hosted at http://update.sonarsource.org.
+ * HTTP client to load data from the remote update center hosted at https://update.sonarsource.org.
  *
  * @since 2.4
  */
@@ -53,7 +53,7 @@ import org.sonar.updatecenter.common.UpdateCenterDeserializer.Mode;
     type = PropertyType.BOOLEAN),
   @Property(
     key = UpdateCenterClient.URL_PROPERTY,
-    defaultValue = "http://update.sonarsource.org/update-center.properties",
+    defaultValue = "https://update.sonarsource.org/update-center.properties",
     name = "Update Center URL",
     category = "Update Center",
     project = false,

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log
index 6843140a6ba8e06c900b11bcbc2bec6111131c89..020c7b953897c46c512a607e456ac69213be2062 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log
+++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log
@@ -45,7 +45,7 @@ Picked up JAVA_TOOL_OPTIONS: -Djava.awt.headless=true
 2015.11.02 09:22:14 INFO  web[o.s.s.p.ServerPluginRepository] Deploy plugin SVN / 1.2 / d04c3cdb21f48905dd8300d1129ec90281aa6db2
 2015.11.02 09:22:14 INFO  web[o.s.s.d.m.DatabaseMigrator] Create database
 2015.11.02 09:22:14 INFO  web[o.s.s.p.RailsAppsDeployer] Deploying Ruby on Rails applications
-2015.11.02 09:22:15 INFO  web[o.s.s.p.UpdateCenterClient] Update center: http://update.sonarsource.org/update-center.properties (no proxy)
+2015.11.02 09:22:15 INFO  web[o.s.s.p.UpdateCenterClient] Update center: https://update.sonarsource.org/update-center.properties (no proxy)
 2015.11.02 09:22:15 INFO  web[o.s.s.e.IndexCreator] Create index users
 2015.11.02 09:22:15 INFO   es[o.e.cluster.metadata]  [sonar-1446452521489] [users] creating index, cause [api], templates [], shards [5]/[0], mappings []
 2015.11.02 09:22:15 INFO  web[o.s.s.e.IndexCreator] Create type users/user

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
index 8e0ce1dcf36808cdafae8f1de7e5e63b3b947277..c91786bc460d00baa6c0169e1f20b9d9a09e4c32 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.when;
 
 public class UpdateCenterClientTest {
 
-  static final String BASE_URL = "http://update.sonarsource.org";
+  static final String BASE_URL = "https://update.sonarsource.org";
   UriReader reader;
   Settings settings;
 
@@ -51,8 +51,8 @@ public class UpdateCenterClientTest {
   public void startServer() throws Exception {
     reader = mock(UriReader.class);
     settings = new Settings()
-      .setProperty(UpdateCenterClient.URL_PROPERTY, BASE_URL)
-      .setProperty(UpdateCenterClient.ACTIVATION_PROPERTY, true);
+        .setProperty(UpdateCenterClient.URL_PROPERTY, BASE_URL)
+        .setProperty(UpdateCenterClient.ACTIVATION_PROPERTY, true);
     underTest = new UpdateCenterClient(reader, settings);
   }
 

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 5fe6666414738bee2cea37787169513968b4d010..ffa770fb371681283dd527845dd598de024652b7 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -180,7 +180,7 @@
 #--------------------------------------------------------------------------------------------------
 # UPDATE CENTER
 
-# Update Center requires an internet connection to request http://update.sonarsource.org
+# Update Center requires an internet connection to request https://update.sonarsource.org
 # It is enabled by default.
 #sonar.updatecenter.activate=true