Merge branch 'branch-4.5'

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java
	sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
	sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql

diff --cc server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java
index 755c8ad5cefe8a3a4d9911c6ac2f83a9968873a6,5d280b4f7a28b887f8df49b0d1797f248de2070d..71a7692b55954212d635c84e6914f8f4a76074fa
--- 1/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java
@@@ -23,10 -23,20 +23,21 @@@ import com.google.common.collect.Immuta
  import org.sonar.server.db.migrations.v36.ViolationMigration;
  import org.sonar.server.db.migrations.v42.CompleteIssueMessageMigration;
  import org.sonar.server.db.migrations.v42.PackageKeysMigration;
- import org.sonar.server.db.migrations.v43.*;
- import org.sonar.server.db.migrations.v44.*;
+ import org.sonar.server.db.migrations.v43.ConvertIssueDebtToMinutesMigration;
+ import org.sonar.server.db.migrations.v43.DevelopmentCostMeasuresMigration;
+ import org.sonar.server.db.migrations.v43.IssueChangelogMigration;
+ import org.sonar.server.db.migrations.v43.NotResolvedIssuesOnRemovedComponentsMigration;
+ import org.sonar.server.db.migrations.v43.RequirementMeasuresMigration;
+ import org.sonar.server.db.migrations.v43.TechnicalDebtMeasuresMigration;
+ import org.sonar.server.db.migrations.v44.ChangeLogMigration;
+ import org.sonar.server.db.migrations.v44.ConvertProfileMeasuresMigration;
+ import org.sonar.server.db.migrations.v44.FeedQProfileDatesMigration;
+ import org.sonar.server.db.migrations.v44.FeedQProfileKeysMigration;
+ import org.sonar.server.db.migrations.v44.IssueActionPlanKeyMigration;
+ import org.sonar.server.db.migrations.v44.MeasureDataMigration;
  import org.sonar.server.db.migrations.v45.AddMissingRuleParameterDefaultValuesMigration;
+ import org.sonar.server.db.migrations.v45.DeleteMeasuresOnDeletedProfilesMigration;
 +import org.sonar.server.db.migrations.v50.InsertProjectsAuthorizationUpdatedAtMigration;
  
  import java.util.List;
  
@@@ -57,9 -67,7 +68,10 @@@ public interface DatabaseMigrations 
  
      // 4.5
      AddMissingRuleParameterDefaultValuesMigration.class,
 -    DeleteMeasuresOnDeletedProfilesMigration.class
++    DeleteMeasuresOnDeletedProfilesMigration.class,
 +
 +    // 5.0
 +    InsertProjectsAuthorizationUpdatedAtMigration.class
    );
  
  }

diff --cc sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index ddf06f6e80b051074b535eed4f74b7d4bd32115f,d9ea9b3d667edd861f386ac55b04131968b69c2e..78c9e4ceb491f854c6d4c34cadd6aa5b4b9db5d3
--- 1/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
--- 2/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@@ -253,8 -253,7 +253,9 @@@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) 
  INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('581');
  INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('582');
  INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('583');
+ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('584');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('700');
 +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('701');
  
  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', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
  ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;