From: Janos Gyerik <janos.gyerik@sonarsource.com>
Date: Thu, 7 Mar 2019 15:35:51 +0000 (+0100)
Subject: Revert "SONAR-11626 Make set/unset_baseline internal"
X-Git-Tag: 7.7~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=acf96ad21a8d2165149b6808c18a8d49a1801222;p=sonarqube.git

Revert "SONAR-11626 Make set/unset_baseline internal"

This reverts commit edfade01ea94fffa9802bd8d13f9455b13878611.
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java
index b4e38d51182..981cf8659f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SetBaselineAction.java
@@ -67,7 +67,6 @@ public class SetBaselineAction implements ProjectAnalysesWsAction {
         "  <li>'Administer' rights on the specified project</li>" +
         "</ul>")
       .setSince("7.7")
-      .setInternal(true)
       .setPost(true)
       .setHandler(this);
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java
index 3cdb4bddbfc..869f434f2bc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UnsetBaselineAction.java
@@ -64,7 +64,6 @@ public class UnsetBaselineAction implements ProjectAnalysesWsAction {
         "</ul>")
       .setSince("7.7")
       .setPost(true)
-      .setInternal(true)
       .setHandler(this);
 
     action.createParam(PARAM_PROJECT)
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java
index 20982e2f6bd..418d3121172 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/SetBaselineActionTest.java
@@ -268,7 +268,7 @@ public class SetBaselineActionTest {
     assertThat(definition.isPost()).isTrue();
     assertThat(definition.key()).isEqualTo("set_baseline");
     assertThat(definition.since()).isEqualTo("7.7");
-    assertThat(definition.isInternal()).isTrue();
+    assertThat(definition.isInternal()).isFalse();
   }
 
   private void logInAsProjectAdministrator(ComponentDto project) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java
index 5e0e057a5bd..d99009ee5b8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UnsetBaselineActionTest.java
@@ -256,7 +256,7 @@ public class UnsetBaselineActionTest {
     assertThat(definition.isPost()).isTrue();
     assertThat(definition.key()).isEqualTo("unset_baseline");
     assertThat(definition.since()).isEqualTo("7.7");
-    assertThat(definition.isInternal()).isTrue();
+    assertThat(definition.isInternal()).isFalse();
   }
 
   private void logInAsProjectAdministrator(ComponentDto project) {
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 52978ab9561..ef9617271ca 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
@@ -151,6 +151,7 @@ public class CorePropertyDefinitions {
           "<li>'previous_version' to compare to the previous version in the project history</li>" +
           "<li>A version, for example '1.2' or 'BASELINE'</li></ul>" +
           "<p>When specifying a number of days or a date, the snapshot selected for comparison is the first one available inside the corresponding time range. </p>" +
+          "<p>This property has no effect when a baseline is manually set on a long-living branch, such as the main branch.<p/>" +
           "<p>Changing this property only takes effect after subsequent project inspections.<p/>")
         .defaultValue(DEFAULT_LEAK_PERIOD)
         .category(CoreProperties.CATEGORY_GENERAL)