SONAR-2706 Change migration script ID after rebase from master

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 053615c276148d6aa385a195e50485928a55caf4..43476f3f6cff0e174571159c44d5c38b58d819df 100644 (file)
--- 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 e229742494bf91086155a5b347693328f17b3621..445efefd4765c05ecdf7e7357d478d966395773c 100644 (file)
--- 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 bcd10ec2585305abb00fa22b1905e706c76c1c56..b11e88fb4b4e0194cbfc5631f5d7acfd0045495f 100644 (file)
--- 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/301_add_review_data.rb
deleted file mode 100644 (file)
index e0da525..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_review_data.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Sonar, open source software quality management tool.
-# Copyright (C) 2008-2012 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# Sonar 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.
-#
-# Sonar 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 Sonar; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
-#
-class AddReviewData < ActiveRecord::Migration
-
-  def self.up
-    add_column 'reviews', 'data', :string, :null => true, :limit => 4000
-  end
-
-end
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb
new file mode 100644 (file)
index 0000000..e0da525
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb
@@ -0,0 +1,26 @@
+#
+# Sonar, open source software quality management tool.
+# Copyright (C) 2008-2012 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# Sonar 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.
+#
+# Sonar 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 Sonar; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+#
+class AddReviewData < ActiveRecord::Migration
+
+  def self.up
+    add_column 'reviews', 'data', :string, :null => true, :limit => 4000
+  end
+
+end
\ No newline at end of file