aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2017-01-31 16:32:49 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2017-02-01 14:13:03 +0100
commit62e070ba1bbdd436914a02a790ab541644063d90 (patch)
treee7336a06e63928184b6dc7bd7177e170f7372d72
parent5fba673a6800d92fc26ea0e491cbb2eec8364797 (diff)
downloadsonarqube-62e070ba1bbdd436914a02a790ab541644063d90.tar.gz
sonarqube-62e070ba1bbdd436914a02a790ab541644063d90.zip
SONAR-7762 Remove allow to signup feature
-rw-r--r--it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java2
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java4
-rw-r--r--server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json3
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java1
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json3
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java7
6 files changed, 11 insertions, 9 deletions
diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
index 5cf74a17343..7dff2a847ce 100644
--- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
+++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
@@ -92,7 +92,7 @@ public class LocalAuthenticationTest {
@After
public void resetProperties() throws Exception {
- resetSettings(ORCHESTRATOR, null, "sonar.forceAuthentication", "sonar.allowUsersToSignUp");
+ resetSettings(ORCHESTRATOR, null, "sonar.forceAuthentication");
}
@Test
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
index 5adf2b40e9c..1304be19660 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
@@ -34,7 +34,6 @@ import org.sonar.db.Database;
import org.sonar.db.dialect.H2;
import org.sonar.server.ui.PageRepository;
-import static org.sonar.api.CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY;
import static org.sonar.api.CoreProperties.HOURS_IN_DAY;
import static org.sonar.api.CoreProperties.RATING_GRID;
import static org.sonar.core.config.WebConstants.SONAR_LF_ENABLE_GRAVATAR;
@@ -52,8 +51,7 @@ public class GlobalAction implements NavigationWsAction {
SONAR_LF_GRAVATAR_SERVER_URL,
SONAR_UPDATECENTER_ACTIVATE,
HOURS_IN_DAY,
- RATING_GRID,
- CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY);
+ RATING_GRID);
private final PageRepository pageRepository;
private final Settings settings;
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json
index 700e11d58c3..47f03a90c59 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/global-example.json
@@ -16,8 +16,7 @@
"sonar.lf.gravatarServerUrl": "http://some-server.tld/logo.png",
"sonar.updatecenter.activate": "false",
"sonar.technicalDebt.hoursInDay": "10",
- "sonar.technicalDebt.ratingGrid": "0.05,0.1,0.2,0.5",
- "sonar.allowUsersToSignUp": "true"
+ "sonar.technicalDebt.ratingGrid": "0.05,0.1,0.2,0.5"
},
"logoUrl": "http://example.com/my-custom-logo.png",
"logoWidth": "135",
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
index 2a4535d197a..f246371b7c4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
@@ -91,7 +91,6 @@ public class GlobalActionTest {
settings.setProperty("sonar.updatecenter.activate", false);
settings.setProperty("sonar.technicalDebt.hoursInDay", "10");
settings.setProperty("sonar.technicalDebt.ratingGrid", "0.05,0.1,0.2,0.5");
- settings.setProperty("sonar.allowUsersToSignUp", true);
// This setting should be ignored as it's not needed
settings.setProperty("sonar.defaultGroup", "sonar-users");
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json
index d6d1fd25d9a..dfd79237733 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalActionTest/settings.json
@@ -6,7 +6,6 @@
"sonar.lf.enableGravatar": "true",
"sonar.updatecenter.activate": "false",
"sonar.technicalDebt.hoursInDay": "10",
- "sonar.technicalDebt.ratingGrid": "0.05,0.1,0.2,0.5",
- "sonar.allowUsersToSignUp": "true"
+ "sonar.technicalDebt.ratingGrid": "0.05,0.1,0.2,0.5"
}
}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
index b4eb78e6721..273224793d9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
@@ -183,7 +183,14 @@ public interface CoreProperties {
String CORE_FORCE_AUTHENTICATION_PROPERTY = "sonar.forceAuthentication";
boolean CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE = false;
+
+ /**
+ * @deprecated since 6.3. This feature is not supported anymore
+ * @see <a href="https://jira.sonarsource.com/browse/SONAR-7762">SONAR-7762/a>
+ */
+ @Deprecated
String CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY = "sonar.allowUsersToSignUp";
+
String CORE_DEFAULT_GROUP = "sonar.defaultGroup";
String CORE_DEFAULT_GROUP_DEFAULT_VALUE = "sonar-users";
boolean CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE = false;