From 517c672726ddb6324079570eeb93144f7fde01e4 Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <bellingard@gmail.com>
Date: Mon, 14 May 2012 12:52:31 +0200
Subject: [PATCH] SONAR-2706 Change migration script ID after rebase from
 master

---
 .../java/org/sonar/core/persistence/DatabaseVersion.java   | 2 +-
 .../resources/org/sonar/core/persistence/rows-derby.sql    | 1 +
 sonar-server/pom.xml                                       | 7 -------
 .../{301_add_review_data.rb => 303_add_review_data.rb}     | 0
 4 files changed, 2 insertions(+), 8 deletions(-)
 rename sonar-server/src/main/webapp/WEB-INF/db/migrate/{301_add_review_data.rb => 303_add_review_data.rb} (100%)

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index 053615c2761..43476f3f6cf 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 302;
+  public static final int LAST_VERSION = 303;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql
index e229742494b..445efefd476 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql
@@ -204,6 +204,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('287');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('300');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('301');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('302');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('303');
 
 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;
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index bcd10ec2585..b11e88fb4b4 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -484,13 +484,6 @@
           <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.codehaus.sonar-plugins</groupId>
-          <artifactId>sonar-jira-reviews-plugin</artifactId>
-          <version>1.0-SNAPSHOT</version>
-          <type>sonar-plugin</type>
-          <scope>provided</scope>
-        </dependency>
       </dependencies>
     </profile>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_review_data.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb
similarity index 100%
rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_review_data.rb
rename to sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb
-- 
2.39.5