diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-03-29 15:03:10 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-04-13 11:51:55 +0200 |
| commit | 8bf3014f238206ecb370742f749608ae577fb43c (patch) | |
| tree | 5ede61a468410c9c64f41076f36c5cc6794562da /sonar-plugin-api | |
| parent | ee51a9a448d08d824e0e4751aab913078e534925 (diff) | |
| download | sonarqube-8bf3014f238206ecb370742f749608ae577fb43c.tar.gz sonarqube-8bf3014f238206ecb370742f749608ae577fb43c.zip | |
SONAR-9014 Replace 'sonar.defaultGroup' setting usage by hardcoded 'sonar-users'
Diffstat (limited to 'sonar-plugin-api')
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java | 12 | ||||
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/UserIdentity.java | 3 |
2 files changed, 13 insertions, 2 deletions
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 54612177c24..f5753d6488b 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 @@ -191,8 +191,20 @@ public interface CoreProperties { @Deprecated String CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY = "sonar.allowUsersToSignUp"; + /** + * @deprecated since 6.4. The default group is hardcoded to 'sonar-users' + * @see <a href="https://jira.sonarsource.com/browse/SONAR-9014">SONAR-9014/a> + */ + @Deprecated String CORE_DEFAULT_GROUP = "sonar.defaultGroup"; + + /** + * @deprecated since 6.4. The default group is hardcoded to 'sonar-users' + * @see <a href="https://jira.sonarsource.com/browse/SONAR-9014">SONAR-9014/a> + */ + @Deprecated String CORE_DEFAULT_GROUP_DEFAULT_VALUE = "sonar-users"; + boolean CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE = false; /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/UserIdentity.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/UserIdentity.java index 18b55dfc1a1..f26c4491b78 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/UserIdentity.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/UserIdentity.java @@ -26,7 +26,6 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.api.CoreProperties; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -160,7 +159,7 @@ public final class UserIdentity { * <ul> * <li>When groups are not empty, group membership is synchronized when user logs in : * <ul> - * <li>User won't belong anymore to a group that is not in the list (even the default group defined in {@link CoreProperties#CORE_DEFAULT_GROUP})</li> + * <li>User won't belong anymore to a group that is not in the list (even the default group defined in 'sonar-users')</li> * <li>User will belong only to groups that exist in SonarQube</li> * <li>Groups that don't exist in SonarQube are silently ignored</li> * </ul> |