222 files changed, 248 insertions, 17 deletions

diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index d15997a4a14..f225dbac9ca 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -50,6 +50,8 @@ dependencies {
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
+  compile project(':server:sonar-webserver-auth')
+  compile project(':server:sonar-webserver-common')
   compile project(':server:sonar-webserver-ws')
   compile project(':sonar-core')
   compile project(':sonar-duplications')
@@ -80,8 +82,9 @@ dependencies {
   testCompile 'org.subethamail:subethasmtp'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
-  testCompile project(':sonar-testing-harness')
+  testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
+  testCompile project(':sonar-testing-harness')
 
   runtime 'io.jsonwebtoken:jjwt-jackson'
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
index 5e6a0a48dd0..947310f2274 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java
@@ -21,16 +21,17 @@ package org.sonar.server.permission;
 
 import java.util.List;
 import java.util.Optional;
+import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.permission.GroupPermissionDto;
 
+import static java.lang.String.format;
 import static org.sonar.api.web.UserRole.PUBLIC_PERMISSIONS;
 import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
+import static org.sonar.server.exceptions.BadRequestException.checkRequest;
 import static org.sonar.server.permission.PermissionChange.Operation.ADD;
 import static org.sonar.server.permission.PermissionChange.Operation.REMOVE;
-import static org.sonar.server.permission.RequestValidator.validateNotAnyoneAndAdminPermission;
-import static org.sonar.server.exceptions.BadRequestException.checkRequest;
 
 public class GroupPermissionChanger {
 
@@ -117,6 +118,11 @@ public class GroupPermissionChanger {
     return true;
   }
 
+  private static void validateNotAnyoneAndAdminPermission(String permission, GroupIdOrAnyone group) {
+    checkRequest(!GlobalPermissions.SYSTEM_ADMIN.equals(permission) || !group.isAnyone(),
+      format("It is not possible to add the '%s' permission to group 'Anyone'.", permission));
+  }
+
   private boolean removePermission(DbSession dbSession, GroupPermissionChange change) {
     if (!loadExistingPermissions(dbSession, change).contains(change.getPermission())) {
       return false;
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
new file mode 100644
index 00000000000..b324ed2f69a
--- /dev/null
+++ b/server/sonar-webserver-auth/build.gradle
@@ -0,0 +1,55 @@
+sonarqube {
+  properties {
+    property 'sonar.projectName', "${projectTitle} :: WebServer :: Authentification and Identity"
+  }
+}
+
+configurations {
+  tests
+
+  testCompile.extendsFrom tests
+}
+
+dependencies {
+  // please keep the list grouped by configuration and ordered by name
+
+  compile 'com.google.code.gson:gson'
+  compile 'com.google.guava:guava'
+  compile 'io.jsonwebtoken:jjwt-api'
+  compile 'io.jsonwebtoken:jjwt-impl'
+  compile project(':sonar-core')
+  compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-process')
+  compile project(':server:sonar-server-common')
+  compile project(':server:sonar-webserver-common')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+  compile project(':sonar-plugin-api-impl')
+  compile 'org.mindrot:jbcrypt'
+
+  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnly 'javax.servlet:javax.servlet-api'
+
+  testCompile 'com.h2database:h2'
+  testCompile 'com.google.code.findbugs:jsr305'
+  testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'javax.servlet:javax.servlet-api'
+  testCompile 'org.apache.logging.log4j:log4j-api'
+  testCompile 'org.apache.logging.log4j:log4j-core'
+  testCompile 'org.assertj:assertj-guava'
+  testCompile 'org.mockito:mockito-core'
+  testCompile project(':server:sonar-db-testing')
+  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
+  testCompile project(':sonar-testing-harness')
+
+  runtime 'io.jsonwebtoken:jjwt-jackson'
+}
+
+task testJar(type: Jar) {
+  classifier = 'tests'
+  from sourceSets.test.output
+}
+
+artifacts {
+  tests testJar
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationError.java
index b0a79c33687..b0a79c33687 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationError.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java
index 244ccfbc2a8..244ccfbc2a8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationFilter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationModule.java
index 8309447b400..8309447b400 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationModule.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationRedirection.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationRedirection.java
index b3e91772dd1..b3e91772dd1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationRedirection.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/AuthenticationRedirection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/BaseContextFactory.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/BaseContextFactory.java
index 0c9385b2e4e..0c9385b2e4e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/BaseContextFactory.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/BaseContextFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/BasicAuthentication.java
index 71dbd0428fa..71dbd0428fa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/BasicAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/Cookies.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/Cookies.java
index 1af5276cbcd..1af5276cbcd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/Cookies.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/Cookies.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/Credentials.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/Credentials.java
index fc92b9580c0..fc92b9580c0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/Credentials.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/Credentials.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CredentialsAuthentication.java
index 52083037cab..52083037cab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CredentialsAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java
index 6a0187e35c9..6a0187e35c9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsLocalAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CredentialsLocalAuthentication.java
index de76fc27447..de76fc27447 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsLocalAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CredentialsLocalAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/CustomAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CustomAuthentication.java
index ee80b12c135..ee80b12c135 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/CustomAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/CustomAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/HttpHeadersAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/HttpHeadersAuthentication.java
index 29ed2e65195..29ed2e65195 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/HttpHeadersAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/HttpHeadersAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java
index c1484f905c8..c1484f905c8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/IdentityProviderRepository.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/InitFilter.java
index 5b90a220d67..5b90a220d67 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/InitFilter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java
index f94d1673364..f94d1673364 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java
index b961187789f..b961187789f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/JwtHttpHandler.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtSerializer.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/JwtSerializer.java
index 33d5aa3d958..33d5aa3d958 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/JwtSerializer.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/JwtSerializer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/LogOAuthWarning.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/LogOAuthWarning.java
index fbc751cc034..fbc751cc034 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/LogOAuthWarning.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/LogOAuthWarning.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java
index 45c314c21de..45c314c21de 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParameters.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java
index debc6a677f1..debc6a677f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackContext.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2CallbackContext.java
index 1a0413b3fcf..1a0413b3fcf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackContext.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2CallbackContext.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java
index eba7efbdabd..eba7efbdabd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java
index 6d9b3810a1b..6d9b3810a1b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java
index 0f6c17fc49c..0f6c17fc49c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/OAuthCsrfVerifier.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/RequestAuthenticator.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/RequestAuthenticator.java
index 48c4b269bb2..48c4b269bb2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/RequestAuthenticator.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/RequestAuthenticator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/RequestAuthenticatorImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/RequestAuthenticatorImpl.java
index 0d5643cc5b9..0d5643cc5b9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/RequestAuthenticatorImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/RequestAuthenticatorImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/SafeModeUserSession.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/SafeModeUserSession.java
index 85828432ad1..85828432ad1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/SafeModeUserSession.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/SafeModeUserSession.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdater.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdater.java
index aa55e9e1adb..aa55e9e1adb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdater.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImpl.java
index 87326e6c236..87326e6c236 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserRegistrar.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrar.java
index e398d2249b2..e398d2249b2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserRegistrar.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrar.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java
index 6f408e3c7fc..6f408e3c7fc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistrarImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserRegistration.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistration.java
index fc6dc4a8d4d..fc6dc4a8d4d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserRegistration.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserRegistration.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java
index 4f28a4cad4e..4f28a4cad4e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/UserSessionInitializer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java
index 0e61085c6cc..0e61085c6cc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/AuthenticationEvent.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java
index 42a5c90acf0..42a5c90acf0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/AuthenticationEventImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java
index a4b7196232a..a4b7196232a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/AuthenticationException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/package-info.java
index 329add30331..329add30331 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/event/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/event/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/exception/EmailAlreadyExistsRedirectionException.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/exception/EmailAlreadyExistsRedirectionException.java
index c2d103709b4..c2d103709b4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/exception/EmailAlreadyExistsRedirectionException.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/exception/EmailAlreadyExistsRedirectionException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/exception/RedirectionException.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/exception/RedirectionException.java
index b566ef376c4..b566ef376c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/exception/RedirectionException.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/exception/RedirectionException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/exception/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/exception/package-info.java
index af6555c0df2..af6555c0df2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/exception/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/exception/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/package-info.java
index 6ce3daa6d3c..6ce3daa6d3c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java
index 6c8aa140701..6c8aa140701 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/DefaultOrganizationEnforcer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/MemberUpdater.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/MemberUpdater.java
index 0f6c126a6a6..0f6c126a6a6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/MemberUpdater.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/MemberUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java
index cfb1cbad52b..cfb1cbad52b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/NoopDefaultOrganizationCache.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganisationSupport.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganisationSupport.java
index 0198cae2b4e..0198cae2b4e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganisationSupport.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganisationSupport.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationAlmBinding.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationAlmBinding.java
index 80584ff7f47..80584ff7f47 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationAlmBinding.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationAlmBinding.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationUpdater.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdater.java
index de4f15b2ee7..de4f15b2ee7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationUpdater.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java
index 38f4a3c1a17..38f4a3c1a17 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationUpdaterImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidation.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationValidation.java
index 37fb7eb5758..37fb7eb5758 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidation.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java
index ab6e0c4fb87..ab6e0c4fb87 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganizationValidationImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/package-info.java
index 0b32d7b6139..0b32d7b6139 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupId.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/GroupId.java
index 0faba895d4a..f27165abf95 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupId.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/GroupId.java
@@ -28,7 +28,6 @@ import static java.util.Objects.requireNonNull;
  * Reference to a user group, as used internally by the backend. It does
  * not support reference to virtual groups "anyone".
  *
- * @see GroupWsRef
  * @see GroupIdOrAnyone
  */
 @Immutable
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupIdOrAnyone.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/GroupIdOrAnyone.java
index 4a6add59eb6..4a6add59eb6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupIdOrAnyone.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/GroupIdOrAnyone.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionService.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionService.java
index fdfe77d7383..fdfe77d7383 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionService.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java
index a7278d4ed20..a7278d4ed20 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/PermissionServiceImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/ProjectId.java
index 0fb1941e3b8..0fb1941e3b8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ProjectId.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/ProjectId.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserId.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/UserId.java
index 4c859a29322..4c859a29322 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/UserId.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/UserId.java
diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/package-info.java
new file mode 100644
index 00000000000..1fc3553cd81
--- /dev/null
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/permission/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.server.permission;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotification.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotification.java
index ee7c4cb8b54..ee7c4cb8b54 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotification.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotification.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationBuilder.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationBuilder.java
index 4115d0641ba..4115d0641ba 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationBuilder.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationBuilder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandler.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandler.java
index 302ba14ad9b..302ba14ad9b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandler.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandler.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java
index ccc644b02a1..ccc644b02a1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java
index 96750f5976c..96750f5976c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfile.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridge.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridge.java
index 58feb3b73f1..58feb3b73f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridge.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridge.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java
index 52d52009f03..52d52009f03 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsert.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java
index fab592130f1..fab592130f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java
index 9134b3a464b..9134b3a464b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java
index b47ff98b3be..b47ff98b3be 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepository.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java
index 9473d574a04..9473d574a04 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java
index 4992402a0d9..4992402a0d9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdate.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java
index b711c69c15b..b711c69c15b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java
index e37e84297db..e37e84297db 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListener.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/DescendantProfilesSupplier.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/DescendantProfilesSupplier.java
index ef073340e7a..ef073340e7a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/DescendantProfilesSupplier.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/DescendantProfilesSupplier.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/QProfileName.java
index 8b134c00ece..8b134c00ece 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/QProfileName.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
index 106fd158b26..106fd158b26 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java
index 28a55cdb37f..28a55cdb37f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
index 2b5a2f8e19f..2b5a2f8e19f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/package-info.java
new file mode 100644
index 00000000000..6100f94b48a
--- /dev/null
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.server.qualityprofile;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/AbstractUserSession.java
index bba45afcf16..bba45afcf16 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/AbstractUserSession.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/CompatibilityRealm.java
index 2f2aa1df59e..2f2aa1df59e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/CompatibilityRealm.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/DoPrivileged.java
index 4f695b25f8d..4f695b25f8d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/DoPrivileged.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ExternalIdentity.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/ExternalIdentity.java
index 483f4590ca2..483f4590ca2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ExternalIdentity.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/ExternalIdentity.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/NewUser.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/NewUser.java
index cd7b51116ee..cd7b51116ee 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/NewUser.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/NewUser.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/NewUserNotifier.java
index e5dc562bd70..e5dc562bd70 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/NewUserNotifier.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/SecurityRealmFactory.java
index f98f6ac58ac..f98f6ac58ac 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/SecurityRealmFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/ServerUserSession.java
index 1485eca1891..1485eca1891 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/ServerUserSession.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/SystemPasscode.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/SystemPasscode.java
index 238f3088325..238f3088325 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/SystemPasscode.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/SystemPasscode.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/SystemPasscodeImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/SystemPasscodeImpl.java
index 1f68993e59b..1f68993e59b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/SystemPasscodeImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/SystemPasscodeImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
index 3e5712bc5fa..3e5712bc5fa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UpdateUser.java
index 746867d8285..746867d8285 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UpdateUser.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UpdateUser.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserSession.java
index 3399e36cdcc..3399e36cdcc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserSession.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactory.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserSessionFactory.java
index 6c9500a4769..6c9500a4769 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactory.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserSessionFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java
index 5574be514e8..5574be514e8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserSessionFactoryImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java
index 4c41bbd9ff7..4c41bbd9ff7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/package-info.java
index 15949569de4..f61161532b3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/package-info.java
@@ -21,3 +21,4 @@
 package org.sonar.server.user;
 
 import javax.annotation.ParametersAreNonnullByDefault;
+
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java
index b6fa36c1225..b6fa36c1225 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/DefaultGroupCreator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java
index 4d7e1836a11..ee3dd264355 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/DefaultGroupCreatorImpl.java
@@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 public class DefaultGroupCreatorImpl implements DefaultGroupCreator {
 
-  static final String DEFAULT_GROUP_NAME = "Members";
+  public static final String DEFAULT_GROUP_NAME = "Members";
   private final DbClient dbClient;
 
   public DefaultGroupCreatorImpl(DbClient dbClient) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java
index ec4fc062633..ec4fc062633 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/DefaultGroupFinder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/package-info.java
index 7d41d8701a5..7d41d8701a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usergroups/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGenerator.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/TokenGenerator.java
index 41f9d5f7665..41f9d5f7665 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGenerator.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/TokenGenerator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java
index 16ccabb009d..16ccabb009d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/TokenGeneratorImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenAuthentication.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/UserTokenAuthentication.java
index f3fdb952c94..f3fdb952c94 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenAuthentication.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/UserTokenAuthentication.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/UserTokenModule.java
index 7f3bd962a68..7f3bd962a68 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/UserTokenModule.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/UserTokenModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usertoken/package-info.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/package-info.java
index 449f4017a05..449f4017a05 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usertoken/package-info.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/package-info.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java
index 8d281d4cb01..8d281d4cb01 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/AuthenticationModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java
index de51e18f546..de51e18f546 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/BasicAuthenticationTest.java
index 493f44d964e..493f44d964e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/BasicAuthenticationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CookiesTest.java
index d7b47679da6..d7b47679da6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CookiesTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsAuthenticationTest.java
index 315d5e83f1d..315d5e83f1d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsAuthenticationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsExternalAuthenticationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsExternalAuthenticationTest.java
index ee90eb0d094..ee90eb0d094 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsExternalAuthenticationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsExternalAuthenticationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsLocalAuthenticationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsLocalAuthenticationTest.java
index 1f7078db322..1f7078db322 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsLocalAuthenticationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsLocalAuthenticationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsTest.java
index f767b0fa4a1..f767b0fa4a1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/CredentialsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java
index 22e794abc93..22e794abc93 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/FakeBasicIdentityProvider.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java
index ae50241c89a..ae50241c89a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/FakeOAuth2IdentityProvider.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/HttpHeadersAuthenticationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/HttpHeadersAuthenticationTest.java
index 0a1672b9dcc..0a1672b9dcc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/HttpHeadersAuthenticationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/HttpHeadersAuthenticationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java
index 533c90934b3..533c90934b3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryRule.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java
index 306ab69b70a..306ab69b70a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/InitFilterTest.java
index c23bb1ed59a..c23bb1ed59a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/InitFilterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java
index cdf97bc3b59..cdf97bc3b59 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java
index ed1f5c22084..ed1f5c22084 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java
index 08aae1e567e..08aae1e567e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java
index 50d26ce5d8d..50d26ce5d8d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImplTest.java
index 07a6fbe79e8..07a6fbe79e8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2AuthenticationParametersImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java
index a42f29cf059..a42f29cf059 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java
index cf2eb5f19fe..cf2eb5f19fe 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java
index d1165e1aea6..d1165e1aea6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/RequestAuthenticatorImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/RequestAuthenticatorImplTest.java
index be9a12754db..be9a12754db 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/RequestAuthenticatorImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/RequestAuthenticatorImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/SafeModeUserSessionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/SafeModeUserSessionTest.java
index 9ba9f5c6f62..9ba9f5c6f62 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/SafeModeUserSessionTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/SafeModeUserSessionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java
index fdc950b673c..fdc950b673c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/TestIdentityProvider.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/TestUserRegistrar.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/TestUserRegistrar.java
index 4244c842138..4244c842138 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/TestUserRegistrar.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/TestUserRegistrar.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImplTest.java
index f20e6c6bdf0..f20e6c6bdf0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserLastConnectionDatesUpdaterImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserRegistrarImplOrgMembershipSyncTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplOrgMembershipSyncTest.java
index c43fdb7f616..c43fdb7f616 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserRegistrarImplOrgMembershipSyncTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplOrgMembershipSyncTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java
index 4673a5fce22..4673a5fce22 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserRegistrarImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java
index cac1b7ceaf7..cac1b7ceaf7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java
index 7ea7b9be47a..7ea7b9be47a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationEventImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java
index 0bfac54e537..0bfac54e537 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationEventSourceTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java
index 8ad3da0070a..8ad3da0070a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionMatcher.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java
index 1472a4da905..1472a4da905 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/event/AuthenticationExceptionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/language/LanguageTesting.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/language/LanguageTesting.java
index 644419c6c37..644419c6c37 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/language/LanguageTesting.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/language/LanguageTesting.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java
index 3f145630f5f..3f145630f5f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/DefaultOrganizationEnforcerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/MemberUpdaterTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/MemberUpdaterTest.java
index 309698e3c49..309698e3c49 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/MemberUpdaterTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/MemberUpdaterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganisationSupportTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/OrganisationSupportTest.java
index fc4e4ea60ee..fc4e4ea60ee 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganisationSupportTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/OrganisationSupportTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationUpdaterImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/OrganizationUpdaterImplTest.java
index 9eb1ed9f23b..9eb1ed9f23b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationUpdaterImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/OrganizationUpdaterImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java
index 1f9cfe7ce1f..1f9cfe7ce1f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/organization/OrganizationValidationImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java
index e6abb50487f..e6abb50487f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/permission/PermissionServiceImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandlerTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandlerTest.java
index 361f291edb4..361f291edb4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandlerTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationHandlerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplateTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplateTest.java
index 3324486882b..3324486882b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplateTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplateTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTest.java
index d3cd519bb2a..d3cd519bb2a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridgeTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridgeTest.java
index 7d0791b2007..7d0791b2007 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridgeTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileDefinitionsBridgeTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java
index c5e0685517c..c5e0685517c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileInsertImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java
index 5643fada891..5643fada891 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileLoaderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java
index 7a7d1a9373e..7a7d1a9373e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java
index f0f481c55e2..f0f481c55e2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java
index ee0f3fbfae8..ee0f3fbfae8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileUpdateImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java
index d796ff9e6fd..d796ff9e6fd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
index 26c8e103942..26c8e103942 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java
index 3c5d4068c61..3c5d4068c61 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AnonymousMockUserSession.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java
index e65c0d35e67..8db859ef91f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java
@@ -21,7 +21,6 @@ package org.sonar.server.tester;
 
 import com.google.common.collect.Maps;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -33,7 +32,6 @@ import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java
index dc3935c4311..adc98994b25 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java
@@ -20,7 +20,6 @@
 package org.sonar.server.tester;
 
 import com.google.common.collect.ImmutableSet;
-import java.io.IOException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.EventListener;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/MockUserSession.java
index e59b0eda6f5..e59b0eda6f5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSession.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/MockUserSession.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/MockUserSessionTest.java
index a57efa676d0..a57efa676d0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/MockUserSessionTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/MockUserSessionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/UserSessionRule.java
index 5e7cc4147d5..5e7cc4147d5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/UserSessionRule.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/package-info.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/package-info.java
index 27beb989b45..27beb989b45 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/package-info.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/tester/package-info.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java
index be3f0360ddb..be3f0360ddb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/DefaultUserTest.java
index 5450d38987a..5450d38987a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/DefaultUserTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/DoPrivilegedTest.java
index cd9f2af3a5a..cd9f2af3a5a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/DoPrivilegedTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ExternalIdentityTest.java
index b6857add6eb..b6857add6eb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ExternalIdentityTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/NewUserNotifierTest.java
index 441487aa7ab..441487aa7ab 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/NewUserNotifierTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/NewUserTest.java
index 9d412b7a519..9d412b7a519 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/NewUserTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java
index d680692abd6..d680692abd6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ServerUserSessionTest.java
index af654c54493..af654c54493 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ServerUserSessionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java
index 352070eacf3..352070eacf3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/SystemPasscodeImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
index 2dfa06ab569..2dfa06ab569 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/TestUserSessionFactory.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
index ec5face1ba2..ec5face1ba2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java
index cfe9b2ac435..cfe9b2ac435 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterReactivateTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterReactivateTest.java
index d280c1af117..d280c1af117 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterReactivateTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterReactivateTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java
index 6e742c79a0b..6e742c79a0b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java
index 01150aec14d..01150aec14d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java
index a894287b77c..a894287b77c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java
index d5222a9e55c..d5222a9e55c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/TokenGeneratorImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticationTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticationTest.java
index b93ae8bb6c8..b93ae8bb6c8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticationTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/UserTokenAuthenticationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java
index 3d2b3669b0c..3d2b3669b0c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/UserTokenModuleTest.java
diff --git a/server/sonar-webserver-auth/src/test/resources/logback-test.xml b/server/sonar-webserver-auth/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..3e34b0f9fc8
--- /dev/null
+++ b/server/sonar-webserver-auth/src/test/resources/logback-test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="okhttp3.mockwebserver">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>
diff --git a/server/sonar-webserver-common/build.gradle b/server/sonar-webserver-common/build.gradle
new file mode 100644
index 00000000000..56cf937d9e2
--- /dev/null
+++ b/server/sonar-webserver-common/build.gradle
@@ -0,0 +1,47 @@
+sonarqube {
+  properties {
+    property 'sonar.projectName', "${projectTitle} :: WebServer :: Common"
+  }
+}
+
+configurations {
+  tests
+
+  testCompile.extendsFrom tests
+}
+
+dependencies {
+  // please keep the list grouped by configuration and ordered by name
+
+  compile 'com.google.guava:guava'
+  compile 'io.jsonwebtoken:jjwt-api'
+  compile 'io.jsonwebtoken:jjwt-impl'
+  compile project(':sonar-core')
+  compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-process')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+  compile project(':sonar-plugin-api-impl')
+  compile 'org.mindrot:jbcrypt'
+
+  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnly 'javax.servlet:javax.servlet-api'
+
+  testCompile 'org.assertj:assertj-guava'
+  testCompile 'com.google.code.findbugs:jsr305'
+  testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'javax.servlet:javax.servlet-api'
+  testCompile 'org.mockito:mockito-core'
+  testCompile project(':server:sonar-db-testing')
+  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
+  testCompile project(':sonar-testing-harness')
+}
+
+task testJar(type: Jar) {
+  classifier = 'tests'
+  from sourceSets.test.output
+}
+
+artifacts {
+  tests testJar
+}
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/BadRequestException.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/BadRequestException.java
index 3113d202d99..3113d202d99 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/BadRequestException.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/BadRequestException.java
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/ForbiddenException.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
index d72eefbd02f..d72eefbd02f 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/Message.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/Message.java
index c069ead73d2..c069ead73d2 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/Message.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/Message.java
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/NotFoundException.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/NotFoundException.java
index f21a98b5157..f21a98b5157 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/NotFoundException.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/NotFoundException.java
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/ServerException.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ServerException.java
index 491c17ed437..491c17ed437 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/ServerException.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ServerException.java
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java
index 0b4af12beee..0b4af12beee 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java
diff --git a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/package-info.java
index c1ac144f25a..c1ac144f25a 100644
--- a/server/sonar-webserver-ws/src/main/java/org/sonar/server/exceptions/package-info.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/Platform.java
index 22f3e451a97..22f3e451a97 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/Platform.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/BooleanTypeValidation.java
index 1b3ade32e60..1b3ade32e60 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/BooleanTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/FloatTypeValidation.java
index fd221dced55..fd221dced55 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/FloatTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
index 84502df47f7..84502df47f7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/LongTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/LongTypeValidation.java
index 9ca540a1d1d..9ca540a1d1d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/LongTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/LongTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java
index ba8598a7786..ba8598a7786 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringListTypeValidation.java
index acb1c7dca8f..acb1c7dca8f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringListTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringTypeValidation.java
index 3851ede0e81..3851ede0e81 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TextTypeValidation.java
index c26ad125162..c26ad125162 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TextTypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidation.java
index 797a3438d8f..797a3438d8f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidation.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidationModule.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidationModule.java
index 3cc4f038e5e..3cc4f038e5e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidationModule.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidationModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidations.java
index 2c8883b77eb..2c8883b77eb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidations.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/Validation.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/Validation.java
index 99d28d0bc96..99d28d0bc96 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/Validation.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/Validation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/package-info.java
new file mode 100644
index 00000000000..8fd4b5b3582
--- /dev/null
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.server.util;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
diff --git a/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java
index 0dc82c559f0..0dc82c559f0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/MessageTest.java
index f05bb55058a..f05bb55058a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/MessageTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java
index ae2ce7846db..ae2ce7846db 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index 4c940770b74..a859ceaff19 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -14,10 +14,14 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'com.google.guava:guava'
+  compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-process')
   compile project(':server:sonar-server')
+  compile project(':server:sonar-webserver-auth')
   compile project(':server:sonar-webserver-ws')
 
   compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnly 'javax.servlet:javax.servlet-api'
 
   testCompile 'org.apache.logging.log4j:log4j-api'
   testCompile 'org.apache.logging.log4j:log4j-core'
@@ -29,6 +33,7 @@ dependencies {
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server", configuration: "tests")
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
 }
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/CreateAction.java
index c10b3bee4f7..d0ae6373e00 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/CreateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/CreateAction.java
@@ -37,8 +37,8 @@ import static org.sonar.db.metric.MetricValidator.MAX_DESCRIPTION_LENGTH;
 import static org.sonar.db.metric.MetricValidator.MAX_DOMAIN_LENGTH;
 import static org.sonar.db.metric.MetricValidator.MAX_KEY_LENGTH;
 import static org.sonar.db.metric.MetricValidator.MAX_NAME_LENGTH;
-import static org.sonar.server.util.MetricKeyValidator.checkMetricKeyFormat;
 import static org.sonar.server.exceptions.BadRequestException.checkRequest;
+import static org.sonar.server.metric.ws.MetricKeyValidator.checkMetricKeyFormat;
 
 public class CreateAction implements MetricsWsAction {
   private static final String ACTION = "create";
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/MetricKeyValidator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricKeyValidator.java
index 275341cf1cf..b21bc47f176 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/MetricKeyValidator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricKeyValidator.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.util;
+package org.sonar.server.metric.ws;
 
 public class MetricKeyValidator {
   /*
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/UpdateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
index e75508ea892..426b09a8bbc 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
@@ -31,7 +31,6 @@ import org.sonar.db.DbSession;
 import org.sonar.db.measure.custom.CustomMeasureDto;
 import org.sonar.db.metric.MetricDto;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.util.MetricKeyValidator;
 
 import static org.sonar.db.metric.MetricValidator.MAX_DESCRIPTION_LENGTH;
 import static org.sonar.db.metric.MetricValidator.MAX_DOMAIN_LENGTH;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java
index 64243e1355b..64243e1355b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionPrivilegeChecker.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/RequestValidator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/RequestValidator.java
index 8fe5e6ba069..337eaff3dd8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/RequestValidator.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/RequestValidator.java
@@ -59,11 +59,6 @@ public class RequestValidator {
       format("The '%s' parameter for global permissions must be one of %s. '%s' was passed.", PARAM_PERMISSION, GlobalPermissions.ALL_ON_ONE_LINE, permission));
   }
 
-  public static void validateNotAnyoneAndAdminPermission(String permission, GroupIdOrAnyone group) {
-    checkRequest(!GlobalPermissions.SYSTEM_ADMIN.equals(permission) || !group.isAnyone(),
-      format("It is not possible to add the '%s' permission to group 'Anyone'.", permission));
-  }
-
   public static void validateQualifier(@Nullable String qualifier, ResourceTypes resourceTypes) {
     if (qualifier == null) {
       return;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/package-info.java
new file mode 100644
index 00000000000..a66df8906dd
--- /dev/null
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.server.permission;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricKeyValidatorTest.java
index 68d3eaba609..da2b5bf2e5c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/MetricKeyValidatorTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricKeyValidatorTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.util;
+package org.sonar.server.metric.ws;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle
index 69988d0f19c..61535505c5e 100644
--- a/server/sonar-webserver-ws/build.gradle
+++ b/server/sonar-webserver-ws/build.gradle
@@ -17,6 +17,7 @@ dependencies {
 
   compile 'com.google.guava:guava'
   compile project(':sonar-core')
+  compile project(':server:sonar-webserver-common')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-ws')
diff --git a/settings.gradle b/settings.gradle
index 8fce24cc360..c8bb7f36c2a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,6 +18,8 @@ include 'server:sonar-server-common'
 include 'server:sonar-vsts'
 include 'server:sonar-web'
 include 'server:sonar-webserver'
+include 'server:sonar-webserver-common'
+include 'server:sonar-webserver-auth'
 include 'server:sonar-webserver-webapi'
 include 'server:sonar-webserver-ws'