SONAR-926 drop the global property "sonar.language"

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
index 790677dec9918d68f360db20865d83a05eaa23c1..7bc015f104d1226bb33d047e4f33f0cd98442ba5 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
@@ -108,13 +108,6 @@ import java.util.List;
     project = false,
     global = false,
     category = CoreProperties.CATEGORY_GENERAL),
-  @Property(
-    key = CoreProperties.PROJECT_LANGUAGE_PROPERTY,
-    name = "Default language",
-    description = "[Deprecated] Default language of the source code to analyse. Keep it blank to allow multi-language analysis.",
-    project = false,
-    global = true,
-    category = CoreProperties.CATEGORY_GENERAL),
   @Property(
     key = CoreProperties.ANALYSIS_MODE,
     defaultValue = CoreProperties.ANALYSIS_MODE_ANALYSIS,

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 6a5b37bee91c3466a4d8ac5b1fc0389025e79a19..f3a8c1ba9c12ffd7a8f630c63349700e6b9ff8c6 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
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 495;
+  public static final int LAST_VERSION = 496;
 
   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-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index dac56aeb9a68859e0e7f8997582ebcc89bf2143b..ac18bdeb6d3073cc911cfa2697b7c02ed50481d1 100644 (file)
--- a/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
@@ -206,6 +206,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('492');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('493');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('494');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('495');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('496');
 
 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/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb
new file mode 100644 (file)
index 0000000..11c858c
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb
@@ -0,0 +1,34 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2013 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube 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.
+#
+# SonarQube 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 this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+#
+# Sonar 4.2
+# SONAR-926
+# The property sonar.language must not be set in global settings
+#
+class DeleteLanguageProperty < ActiveRecord::Migration
+
+  class Property < ActiveRecord::Base
+  end
+
+  def self.up
+    Property.delete_all("prop_key = 'sonar.language'")
+  end
+end