SONAR-9954 add hidden property sonar.editions.jsonUrl

with production default value

diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index 9f02e6aa47cb2af9adc8bad13e9a03bd6ec15fbf..e70437c795bc08c3a064f3ff4a3ccd0cd193e26e 100644 (file)
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -114,7 +114,7 @@ public class ComputeEngineContainerImplTest {
         + 26 // level 1
         + 52 // content of DaoModule
         + 3 // content of EsSearchModule
-        + 66 // content of CorePropertyDefinitions
+        + 67 // content of CorePropertyDefinitions
         + 1 // StopFlagContainer
     );
     assertThat(

diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
index 817759783fbafc014cba8a01f4b407e329e12061..9b0390856efbc0a43369df84e9412718b94503d5 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
@@ -47,6 +47,7 @@ public class CorePropertyDefinitions {
   public static final String ORGANIZATIONS_CREATE_PERSONAL_ORG = "sonar.organizations.createPersonalOrg";
   public static final String ONBOARDING_TUTORIAL_SHOW_TO_NEW_USERS = "sonar.onboardingTutorial.showToNewUsers";
   public static final String DISABLE_NOTIFICATION_ON_BUILT_IN_QPROFILES = "sonar.builtInQualityProfiles.disableNotificationOnUpdate";
+  public static final String EDITIONS_CONFIG_URL = "sonar.editions.jsonUrl";
 
   private CorePropertyDefinitions() {
     // only static stuff
@@ -254,6 +255,15 @@ public class CorePropertyDefinitions {
         .category(CATEGORY_ORGANIZATIONS)
         .type(BOOLEAN)
         .hidden()
+        .build(),
+
+      // EDITIONS
+      PropertyDefinition.builder(EDITIONS_CONFIG_URL)
+        .name("Defines URL of JSON file with the definitions of SonarSource editions.")
+        .defaultValue("https://resources.sonarsource.com/editions.json")
+        .category(CATEGORY_ORGANIZATIONS)
+        .type(BOOLEAN)
+        .hidden()
         .build()));
     return defs;
   }

diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
index aa7bcd07d0df906e8e6dd2eb2290fa6f138e0862..4144587b4be5fd66a0dec1ea94ace211e5e6a3e2 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
@@ -33,7 +33,7 @@ public class CorePropertyDefinitionsTest {
   @Test
   public void all() {
     List<PropertyDefinition> defs = CorePropertyDefinitions.all();
-    assertThat(defs).hasSize(66);
+    assertThat(defs).hasSize(67);
   }
 
   @Test