Merge remote-tracking branch 'origin/branch-5.6'

diff --cc it/it-tests/src/test/java/it/plugins/PluginsTest.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
index 152c564ac02297e7c7914700baadc1419cee7f4e,8cb5da1fe2713af71ceeb2e3ff2d099dacea5466..d48340331452083684b93f9b38bbb3025fd0677e
--- 1/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java
@@@ -46,11 -49,16 +49,12 @@@ public class UpdatesAction implements P
    private static final String ARRAY_PLUGINS = "plugins";
    private static final String ARRAY_UPDATES = "updates";
  
 -  private static final Ordering<PluginUpdateAggregate> NAME_KEY_PLUGIN_UPGRADE_AGGREGATE_ORDERING =
 -    Ordering.from(PluginWSCommons.NAME_KEY_PLUGIN_ORDERING).onResultOf(PluginUpdateAggregateToPlugin.INSTANCE);
 -  private static final Ordering<PluginUpdate> PLUGIN_UPDATE_BY_VERSION_ORDERING = Ordering.natural().onResultOf(new Function<PluginUpdate, String>() {
 -    @Override
 -    public String apply(@Nonnull PluginUpdate input) {
 -      return input.getRelease().getVersion().toString();
 -    }
 -  });
 +  private static final Ordering<PluginUpdateAggregate> NAME_KEY_PLUGIN_UPGRADE_AGGREGATE_ORDERING = Ordering.from(PluginWSCommons.NAME_KEY_PLUGIN_ORDERING)
 +    .onResultOf(PluginUpdateAggregateToPlugin.INSTANCE);
 +  private static final Ordering<PluginUpdate> PLUGIN_UPDATE_BY_VERSION_ORDERING = Ordering.natural()
 +    .onResultOf(input -> input.getRelease().getVersion().toString());
  
+   private final UserSession userSession;
    private final UpdateCenterMatrixFactory updateCenterMatrixFactory;
    private final PluginWSCommons pluginWSCommons;
    private final PluginUpdateAggregator aggregator;

diff --cc server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
index bbd00030f9ccfeb4bbb60b27d0f0c398c1cf81c7,81a2fd5c22ecc7ff05ef6d1dcbc2c0828c81a1d7..bb72587def83212bc88156e6e1cec3236627f0b7
--- 1/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
--- 2/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java
@@@ -68,15 -71,15 +71,10 @@@ public class SearchActionTest 
    DbClient dbClient = db.getDbClient();
    DbSession dbSession = db.getSession();
  
-   WsTester ws;
-   UserIndex index;
- 
-   @Before
-   public void setUp() {
-     index = new UserIndex(esTester.client());
-     ws = new WsTester(new UsersWs(new SearchAction(index, dbClient, new UserJsonWriter(userSession))));
-   }
+   UserIndex index = new UserIndex(esTester.client());
+   UserIndexer userIndexer = (UserIndexer) new UserIndexer(dbClient, esTester.client()).setEnabled(true);
+   WsTester ws = new WsTester(new UsersWs(new SearchAction(index, dbClient, new UserJsonWriter(userSession))));
  
 -  @Before
 -  public void setUp() {
 -    esTester.truncateIndices();
 -  }
 -
    @Test
    public void search_json_example() throws Exception {
      UserDto fmallet = userDb.insertUser(newUserDto("fmallet", "Freddy Mallet", "f@m.com")

diff --cc sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
index 2c3be5b7f11e1feaa8ac9c9247a56db141f1a35f,d59924902aab2651410469d8bca2836445d6b5f3..2e3b5f8bfcbdb8eb4fc6f72e18f57eb58d67ea9e
--- 1/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
--- 2/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
@@@ -83,66 -83,7 +83,67 @@@ import org.sonar.db.version.v55.FeedRul
  import org.sonar.db.version.v55.FeedRulesTypes;
  import org.sonar.db.version.v56.FixLengthOfIssuesMessageOnOracle;
  import org.sonar.db.version.v56.FixTypeOfRuleTypeOnMysql;
+ import org.sonar.db.version.v56.UpdateUsersExternalIdentityWhenEmpty;
 +import org.sonar.db.version.v60.AddAnalysisUuidColumnToCeActivity;
 +import org.sonar.db.version.v60.AddAnalysisUuidColumnToEvents;
 +import org.sonar.db.version.v60.AddAnalysisUuidColumnToMeasures;
 +import org.sonar.db.version.v60.AddBColumnsToProjects;
 +import org.sonar.db.version.v60.AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex;
 +import org.sonar.db.version.v60.AddComponentUuidColumnToMeasures;
 +import org.sonar.db.version.v60.AddComponentUuidColumnsToSnapshots;
 +import org.sonar.db.version.v60.AddLastUsedColumnToRulesProfiles;
 +import org.sonar.db.version.v60.AddProfileKeyToActivities;
 +import org.sonar.db.version.v60.AddUserUpdatedAtToRulesProfiles;
 +import org.sonar.db.version.v60.AddUuidColumnToSnapshots;
 +import org.sonar.db.version.v60.AddUuidColumnsToProjects;
 +import org.sonar.db.version.v60.AddUuidColumnsToResourceIndex;
 +import org.sonar.db.version.v60.AddUuidPathColumnToProjects;
 +import org.sonar.db.version.v60.CleanEventsWithoutAnalysisUuid;
 +import org.sonar.db.version.v60.CleanEventsWithoutSnapshotId;
 +import org.sonar.db.version.v60.CleanMeasuresWithNullAnalysisUuid;
 +import org.sonar.db.version.v60.CleanOrphanRowsInProjects;
 +import org.sonar.db.version.v60.CleanOrphanRowsInResourceIndex;
 +import org.sonar.db.version.v60.CleanOrphanRowsInSnapshots;
 +import org.sonar.db.version.v60.CleanUsurperRootComponents;
 +import org.sonar.db.version.v60.DeleteOrphanDuplicationsIndexRowsWithoutComponentOrAnalysis;
 +import org.sonar.db.version.v60.DeleteOrphanMeasuresWithoutComponent;
 +import org.sonar.db.version.v60.DropIdColumnsFromProjects;
 +import org.sonar.db.version.v60.DropIdColumnsFromResourceIndex;
 +import org.sonar.db.version.v60.DropIdColumnsFromSnapshots;
 +import org.sonar.db.version.v60.DropProjectIdColumnFromMeasures;
 +import org.sonar.db.version.v60.DropRememberMeColumnsFromUsers;
 +import org.sonar.db.version.v60.DropSnapshotIdColumnFromCeActivity;
 +import org.sonar.db.version.v60.DropSnapshotIdColumnFromEvents;
 +import org.sonar.db.version.v60.DropSnapshotIdColumnFromMeasures;
 +import org.sonar.db.version.v60.DropSnapshotIdColumnsFromDuplicationsIndex;
 +import org.sonar.db.version.v60.DropTreeColumnsFromSnapshots;
 +import org.sonar.db.version.v60.DropTreesOfSnapshots;
 +import org.sonar.db.version.v60.DropUnusedMeasuresColumns;
 +import org.sonar.db.version.v60.FixProjectUuidOfDeveloperProjects;
 +import org.sonar.db.version.v60.MakeAnalysisUuidNotNullOnEvents;
 +import org.sonar.db.version.v60.MakeAnalysisUuidNotNullOnMeasures;
 +import org.sonar.db.version.v60.MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex;
 +import org.sonar.db.version.v60.MakeComponentUuidColumnsNotNullOnSnapshots;
 +import org.sonar.db.version.v60.MakeComponentUuidNotNullOnMeasures;
 +import org.sonar.db.version.v60.MakeProfileKeyNotNullOnActivities;
 +import org.sonar.db.version.v60.MakeUuidColumnNotNullOnSnapshots;
 +import org.sonar.db.version.v60.MakeUuidColumnsNotNullOnProjects;
 +import org.sonar.db.version.v60.MakeUuidColumnsNotNullOnResourceIndex;
 +import org.sonar.db.version.v60.MakeUuidPathColumnNotNullOnProjects;
 +import org.sonar.db.version.v60.PopulateAnalysisUuidColumnOnCeActivity;
 +import org.sonar.db.version.v60.PopulateAnalysisUuidOnEvents;
 +import org.sonar.db.version.v60.PopulateAnalysisUuidOnMeasures;
 +import org.sonar.db.version.v60.PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex;
 +import org.sonar.db.version.v60.PopulateComponentUuidColumnsOfSnapshots;
 +import org.sonar.db.version.v60.PopulateComponentUuidOfMeasures;
 +import org.sonar.db.version.v60.PopulateLastUsedColumnOfRulesProfiles;
 +import org.sonar.db.version.v60.PopulateProfileKeyOfActivities;
 +import org.sonar.db.version.v60.PopulateUserUpdatedAtOfRulesProfiles;
 +import org.sonar.db.version.v60.PopulateUuidColumnOnSnapshots;
 +import org.sonar.db.version.v60.PopulateUuidColumnsOfProjects;
 +import org.sonar.db.version.v60.PopulateUuidColumnsOfResourceIndex;
 +import org.sonar.db.version.v60.PopulateUuidPathColumnOnProjects;
 +import org.sonar.db.version.v60.RemoveUsersPasswordWhenNotLocal;
  
  public class MigrationStepModule extends Module {
    @Override
@@@ -226,83 -167,6 +227,84 @@@
        // 5.6
        FixTypeOfRuleTypeOnMysql.class,
        FixLengthOfIssuesMessageOnOracle.class,
 -      UpdateUsersExternalIdentityWhenEmpty.class);
++      UpdateUsersExternalIdentityWhenEmpty.class,
 +
 +      // 6.0
 +      AddUuidColumnsToResourceIndex.class,
 +      PopulateUuidColumnsOfResourceIndex.class,
 +      CleanOrphanRowsInResourceIndex.class,
 +      MakeUuidColumnsNotNullOnResourceIndex.class,
 +      DropIdColumnsFromResourceIndex.class,
 +      DropUnusedMeasuresColumns.class,
 +      AddComponentUuidColumnsToSnapshots.class,
 +      PopulateComponentUuidColumnsOfSnapshots.class,
 +      CleanOrphanRowsInSnapshots.class,
 +      MakeComponentUuidColumnsNotNullOnSnapshots.class,
 +      DropIdColumnsFromSnapshots.class,
 +      AddComponentUuidColumnToMeasures.class,
 +      PopulateComponentUuidOfMeasures.class,
 +      DeleteOrphanMeasuresWithoutComponent.class,
 +      MakeComponentUuidNotNullOnMeasures.class,
 +      DropProjectIdColumnFromMeasures.class,
 +      DropRememberMeColumnsFromUsers.class,
 +      AddUuidColumnsToProjects.class,
 +      PopulateUuidColumnsOfProjects.class,
 +      CleanOrphanRowsInProjects.class,
 +      MakeUuidColumnsNotNullOnProjects.class,
 +      DropIdColumnsFromProjects.class,
 +      AddLastUsedColumnToRulesProfiles.class,
 +      PopulateLastUsedColumnOfRulesProfiles.class,
 +      AddProfileKeyToActivities.class,
 +      PopulateProfileKeyOfActivities.class,
 +      MakeProfileKeyNotNullOnActivities.class,
 +      AddUserUpdatedAtToRulesProfiles.class,
 +      PopulateUserUpdatedAtOfRulesProfiles.class,
 +
 +      // SNAPSHOTS.UUID
 +      AddUuidColumnToSnapshots.class,
 +      PopulateUuidColumnOnSnapshots.class,
 +      MakeUuidColumnNotNullOnSnapshots.class,
 +
 +      // CE_ACTIVITY.ANALYSIS_UUID
 +      AddAnalysisUuidColumnToCeActivity.class,
 +      PopulateAnalysisUuidColumnOnCeActivity.class,
 +      DropSnapshotIdColumnFromCeActivity.class,
 +
 +      // UUID columns of DUPLICATION_INDEX
 +      AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.class,
 +      PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex.class,
 +      DeleteOrphanDuplicationsIndexRowsWithoutComponentOrAnalysis.class,
 +      MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.class,
 +      DropSnapshotIdColumnsFromDuplicationsIndex.class,
 +
 +      // EVENTS.ANALYSIS_UUID
 +      AddAnalysisUuidColumnToEvents.class,
 +      PopulateAnalysisUuidOnEvents.class,
 +      CleanEventsWithoutAnalysisUuid.class,
 +      CleanEventsWithoutSnapshotId.class,
 +      MakeAnalysisUuidNotNullOnEvents.class,
 +      DropSnapshotIdColumnFromEvents.class,
 +
 +      FixProjectUuidOfDeveloperProjects.class,
 +      // PROJECTS.UUID_PATH
 +      AddUuidPathColumnToProjects.class,
 +      PopulateUuidPathColumnOnProjects.class,
 +      MakeUuidPathColumnNotNullOnProjects.class,
 +
 +      RemoveUsersPasswordWhenNotLocal.class,
 +
 +      // PROJECT_MEASURES.ANALYSIS_UUID
 +      AddAnalysisUuidColumnToMeasures.class,
 +      PopulateAnalysisUuidOnMeasures.class,
 +      CleanMeasuresWithNullAnalysisUuid.class,
 +      MakeAnalysisUuidNotNullOnMeasures.class,
 +
 +      CleanUsurperRootComponents.class,
 +
 +      DropTreesOfSnapshots.class,
 +      DropTreeColumnsFromSnapshots.class,
 +      DropSnapshotIdColumnFromMeasures.class,
 +      AddBColumnsToProjects.class
 +    );
    }
  }

diff --cc sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index 5e0c15f1de83930363a9450c15e0faa1943dc921,9c1a3342dd7c2d958d6b59da57aedf16911ad7f3..fff413c49dd0f23704424d5fd882cc57a21710af
--- 1/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
--- 2/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@@ -405,84 -405,8 +405,85 @@@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) 
  INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1150');
  INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1151');
  INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1152');
+ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1153');
  
 -INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1200');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1201');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1202');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1203');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1204');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1205');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1206');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1207');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1208');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1209');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1210');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1211');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1212');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1213');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1214');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1215');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1216');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1217');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1218');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1219');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1220');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1221');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1222');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1223');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1224');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1225');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1226');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1227');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1228');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1229');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1230');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1231');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1232');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1233');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1234');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1235');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1236');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1237');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1238');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1239');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1240');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1241');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1242');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1243');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1244');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1245');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1246');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1247');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1248');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1249');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1250');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1251');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1252');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1253');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1254');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1255');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1256');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1257');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1258');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1259');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1260');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1261');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1262');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1263');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1264');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1265');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1266');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1267');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1268');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1269');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1270');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1271');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1272');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1273');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1274');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1275');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1276');
 +
 +INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482');
  ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;

diff --cc sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
index b10eba51a6fa01fa447a4b78dff5b43122d8619d,d83910ad9100c74809f4f35ec5a2cd6974a8405d..579506d38b1e5652fad8f7ac6f36ffc83d48e8a8
--- 1/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
--- 2/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
@@@ -29,6 -29,6 +29,6 @@@ public class MigrationStepModuleTest 
    public void verify_count_of_added_MigrationStep_types() {
      ComponentContainer container = new ComponentContainer();
      new MigrationStepModule().configure(container);
-     assertThat(container.size()).isEqualTo(125);
 -    assertThat(container.size()).isEqualTo(66);
++    assertThat(container.size()).isEqualTo(126);
    }
  }