From 1930d3927a57af7007c46605ae2a99357218b4ed Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 19 Sep 2015 00:08:53 +0200 Subject: Fix merge of branch feature/ce-monitoring - JS changes (ES2015) - DB migration conflicts --- sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java | 2 +- sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql | 1 + .../src/test/java/org/sonar/db/version/MigrationStepModuleTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'sonar-db') diff --git a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java index bc7cfd3c9fa..04df75b3b78 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java +++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java @@ -29,7 +29,7 @@ import org.sonar.db.MyBatis; public class DatabaseVersion { - public static final int LAST_VERSION = 936; + public static final int LAST_VERSION = 937; /** * The minimum supported version which can be upgraded. Lower diff --git a/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 index 1f670faabea..5d5904a92d7 100644 --- a/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 @@ -355,6 +355,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('933'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('934'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('935'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('936'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('937'); INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; diff --git a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java index 933def51755..bbb1432b157 100644 --- a/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 @@ public class MigrationStepModuleTest { public void verify_count_of_added_MigrationStep_types() { ComponentContainer container = new ComponentContainer(); new MigrationStepModule().configure(container); - assertThat(container.size()).isEqualTo(39); + assertThat(container.size()).isEqualTo(40); } } -- cgit v1.2.3