Revert "SONAR-8151 remove property category Organizations from UI for 6.2"

This reverts commit ba3c13b388823a69e5821aa5d3006e3b1cc01923.

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 35fbd48101b59c8292f59993268de3cc659af0df..a31db40f3ee9fb10dba2e086a351158166025fc4 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
@@ -108,7 +108,7 @@ public class ComputeEngineContainerImplTest {
         + 26 // level 1
         + 47 // content of DaoModule
         + 2 // content of EsSearchModule
-        + 62 // content of CorePropertyDefinitions
+        + 63 // content of CorePropertyDefinitions
         + 1 // content of CePropertyDefinitions
     );
     assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull();

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 03a10b6e8c8bba173e72f5626f54c1cc58fb252f..32e595df780e57d9745a39744110d793be46d845 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
@@ -292,18 +292,15 @@ public class CorePropertyDefinitions {
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(CoreProperties.SUBCATEGORY_DUPLICATIONS_EXCLUSIONS)
         .multiValues(true)
-        .build()
-//       FIXME remove organization property category from UI for release 6.2
-//        ,
-//
-//      // ORGANIZATIONS
-//      PropertyDefinition.builder(ORGANIZATIONS_ANYONE_CAN_CREATE)
-//        .name("Allow any authenticated user to create organizations")
-//        .defaultValue(Boolean.toString(false))
-//        .category(CATEGORY_ORGANIZATIONS)
-//        .type(PropertyType.BOOLEAN)
-//        .build()
-    ));
+        .build(),
+
+      // ORGANIZATIONS
+      PropertyDefinition.builder(ORGANIZATIONS_ANYONE_CAN_CREATE)
+        .name("Allow any authenticated user to create organizations")
+        .defaultValue(Boolean.toString(false))
+        .category(CATEGORY_ORGANIZATIONS)
+        .type(PropertyType.BOOLEAN)
+        .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 bf9d2501497eb5f27d889b81f3d83b9904fd6a41..470cc2f2ed81179e26db2635bf9554924432a791 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
@@ -35,7 +35,7 @@ public class CorePropertyDefinitionsTest {
   @Test
   public void all() {
     List<PropertyDefinition> defs = CorePropertyDefinitions.all();
-    assertThat(defs).hasSize(64);
+    assertThat(defs).hasSize(65);
   }
 
   @Test