Merge branch 'release-2.10'

46 files changed, 219 insertions, 63 deletions

diff --git a/archetypes/sonar-basic-plugin/pom.xml b/archetypes/sonar-basic-plugin/pom.xml
index 8d58f632349..018641def44 100644
--- a/archetypes/sonar-basic-plugin/pom.xml
+++ b/archetypes/sonar-basic-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/archetypes/sonar-gwt-plugin/pom.xml b/archetypes/sonar-gwt-plugin/pom.xml
index 31ec2248c3f..aab1fa370a2 100644
--- a/archetypes/sonar-gwt-plugin/pom.xml
+++ b/archetypes/sonar-gwt-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml
index b43a2c2cae5..d0ca868630e 100644
--- a/plugins/sonar-checkstyle-plugin/pom.xml
+++ b/plugins/sonar-checkstyle-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-cobertura-plugin/pom.xml b/plugins/sonar-cobertura-plugin/pom.xml
index 4fde38170d0..1dbd6f6ccc3 100644
--- a/plugins/sonar-cobertura-plugin/pom.xml
+++ b/plugins/sonar-cobertura-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-core-gwt/pom.xml b/plugins/sonar-core-gwt/pom.xml
index b501ab293a1..4f6a84d051b 100644
--- a/plugins/sonar-core-gwt/pom.xml
+++ b/plugins/sonar-core-gwt/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>sonar-core-gwt</artifactId>
diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml
index 017856716bb..00b03525dc8 100644
--- a/plugins/sonar-core-plugin/pom.xml
+++ b/plugins/sonar-core-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-cpd-plugin/pom.xml b/plugins/sonar-cpd-plugin/pom.xml
index ea0eea7c185..a8c4bb671d8 100644
--- a/plugins/sonar-cpd-plugin/pom.xml
+++ b/plugins/sonar-cpd-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-dbcleaner-plugin/pom.xml b/plugins/sonar-dbcleaner-plugin/pom.xml
index 67ab0934b1e..ef0a699e63f 100644
--- a/plugins/sonar-dbcleaner-plugin/pom.xml
+++ b/plugins/sonar-dbcleaner-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java
index a05bd16bb02..65792f152aa 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java
@@ -37,8 +37,10 @@ public final class PurgeDependencies extends Purge {
 
   public void purge(PurgeContext context) {
     Query query = getSession().createQuery("SELECT d.projectSnapshotId FROM " + DependencyDto.class.getSimpleName() +
-        " d WHERE NOT EXISTS(FROM " + Snapshot.class.getSimpleName() + " s WHERE s.id=d.projectSnapshotId AND s.last=:last)");
-    query.setParameter("last", true);
+        " d WHERE EXISTS(FROM " + Snapshot.class.getSimpleName() + " s WHERE s.id=d.projectSnapshotId AND s.last=:last and s.status=:status)");
+    query.setParameter("last", false);
+    query.setParameter("status", Snapshot.STATUS_PROCESSED);
+
     final List<Integer> projectSnapshotIds = query.getResultList();
     PurgeUtils.executeQuery(getSession(), "", projectSnapshotIds, "DELETE FROM " + DependencyDto.class.getSimpleName() + " WHERE projectSnapshotId in (:ids)");
   }
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java
index 3ce14d6d27b..5fb68a63e88 100644
--- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java
+++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java
@@ -31,6 +31,15 @@ public class PurgeDependenciesTest extends AbstractDbUnitTestCase {
     assertPurge("purgeDependencies");
   }
 
+  /**
+   * See https://jira.codehaus.org/browse/SONAR-2707
+   * Do not remove dependencies which are computed at the same time in other parallel jobs.
+   */
+  @Test
+  public void shouldNotPurgeUnprocessedSnapshots() throws SQLException {
+    assertPurge("shouldNotPurgeUnprocessedSnapshots");
+  }
+
   private void assertPurge(String testName) {
     setupData(testName);
     new PurgeDependencies(getSession()).purge(null);
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml
new file mode 100644
index 00000000000..2d2599d8794
--- /dev/null
+++ b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml
@@ -0,0 +1,73 @@
+<dataset>
+
+  <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="first:project" name="One"
+            root_id="[null]"
+            description="[null]"
+            enabled="true" language="java" copy_resource_id="[null]"/>
+
+  <projects long_name="[null]" id="2" scope="PRJ" qualifier="TRK" kee="second:project" name="Two"
+            root_id="[null]"
+            description="[null]"
+            enabled="true" language="java" copy_resource_id="[null]"/>
+
+
+  <!-- old -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-01 13:58:00.00" version="[null]"
+             project_id="1"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
+             path="[null]"/>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-01 13:58:00.00" version="[null]"
+             project_id="2"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
+             path="[null]"/>
+
+
+  <!-- last -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
+             project_id="1"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
+             project_id="2"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+
+  <!-- in progress -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="5" scope="PRJ" qualifier="TRK" created_at="2008-12-03 13:58:00.00" version="[null]"
+             project_id="1"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="U" islast="false"
+             path="[null]"/>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="6" scope="PRJ" qualifier="TRK" created_at="2008-12-03 13:58:00.00" version="[null]"
+             project_id="2"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="U" islast="false"
+             path="[null]"/>
+
+
+
+  <!-- old dependencies -->
+  <!--<dependencies id="1" from_resource_id="1" from_snapshot_id="1" to_resource_id="2" to_snapshot_id="2"-->
+                <!--parent_dependency_id="[null]" project_snapshot_id="1"-->
+                <!--dep_usage="compile" dep_weight="1" from_scope="PRJ" to_scope="PRJ"/>-->
+
+
+  <!-- last dependencies -->
+  <dependencies id="2" from_resource_id="1" from_snapshot_id="3" to_resource_id="2" to_snapshot_id="4"
+                parent_dependency_id="[null]" project_snapshot_id="3"
+                dep_usage="compile" dep_weight="1" from_scope="PRJ" to_scope="PRJ"/>
+
+  <!-- in progress -->
+  <dependencies id="3" from_resource_id="1" from_snapshot_id="5" to_resource_id="2" to_snapshot_id="6"
+                parent_dependency_id="[null]" project_snapshot_id="5"
+                dep_usage="uses" dep_weight="1" from_scope="PRJ" to_scope="PRJ"/>
+
+</dataset>
\ No newline at end of file
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml
new file mode 100644
index 00000000000..6b143bea1ec
--- /dev/null
+++ b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml
@@ -0,0 +1,73 @@
+<dataset>
+
+  <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="first:project" name="One"
+            root_id="[null]"
+            description="[null]"
+            enabled="true" language="java" copy_resource_id="[null]"/>
+
+  <projects long_name="[null]" id="2" scope="PRJ" qualifier="TRK" kee="second:project" name="Two"
+            root_id="[null]"
+            description="[null]"
+            enabled="true" language="java" copy_resource_id="[null]"/>
+
+
+  <!-- old -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-01 13:58:00.00" version="[null]"
+             project_id="1"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
+             path="[null]"/>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-01 13:58:00.00" version="[null]"
+             project_id="2"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
+             path="[null]"/>
+
+
+  <!-- last -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
+             project_id="1"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
+             project_id="2"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+
+  <!-- in progress -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="5" scope="PRJ" qualifier="TRK" created_at="2008-12-03 13:58:00.00" version="[null]"
+             project_id="1"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="U" islast="false"
+             path="[null]"/>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]"
+             depth="[null]" id="6" scope="PRJ" qualifier="TRK" created_at="2008-12-03 13:58:00.00" version="[null]"
+             project_id="2"
+             parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="U" islast="false"
+             path="[null]"/>
+
+
+
+  <!-- old dependencies -->
+  <dependencies id="1" from_resource_id="1" from_snapshot_id="1" to_resource_id="2" to_snapshot_id="2"
+                parent_dependency_id="[null]" project_snapshot_id="1"
+                dep_usage="compile" dep_weight="1" from_scope="PRJ" to_scope="PRJ"/>
+
+
+  <!-- last dependencies -->
+  <dependencies id="2" from_resource_id="1" from_snapshot_id="3" to_resource_id="2" to_snapshot_id="4"
+                parent_dependency_id="[null]" project_snapshot_id="3"
+                dep_usage="compile" dep_weight="1" from_scope="PRJ" to_scope="PRJ"/>
+
+  <!-- in progress -->
+  <dependencies id="3" from_resource_id="1" from_snapshot_id="5" to_resource_id="2" to_snapshot_id="6"
+                parent_dependency_id="[null]" project_snapshot_id="5"
+                dep_usage="uses" dep_weight="1" from_scope="PRJ" to_scope="PRJ"/>
+
+</dataset>
\ No newline at end of file
diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml
index 074c481794e..8ed7317cfd5 100644
--- a/plugins/sonar-design-plugin/pom.xml
+++ b/plugins/sonar-design-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-email-notifications-plugin/pom.xml b/plugins/sonar-email-notifications-plugin/pom.xml
index db5076fad6c..359ff706848 100644
--- a/plugins/sonar-email-notifications-plugin/pom.xml
+++ b/plugins/sonar-email-notifications-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/plugins/sonar-findbugs-plugin/pom.xml b/plugins/sonar-findbugs-plugin/pom.xml
index 24e5574f95d..7687def4980 100644
--- a/plugins/sonar-findbugs-plugin/pom.xml
+++ b/plugins/sonar-findbugs-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-googleanalytics-plugin/pom.xml b/plugins/sonar-googleanalytics-plugin/pom.xml
index b0e8d77c612..0847913abb7 100644
--- a/plugins/sonar-googleanalytics-plugin/pom.xml
+++ b/plugins/sonar-googleanalytics-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/plugins/sonar-l10n-en-plugin/pom.xml b/plugins/sonar-l10n-en-plugin/pom.xml
index 2080587ce93..63ea27efc65 100644
--- a/plugins/sonar-l10n-en-plugin/pom.xml
+++ b/plugins/sonar-l10n-en-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index bb6d13e93fe..6695634552d 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -266,28 +266,28 @@ backup.page=Backup
 clouds.page=Clouds
 components.page=Components
 coverage.page=Coverage
-default_dashboards.page=Default dashboards
-default_filters.page=Default filters
+default_dashboards.page=Default Dashboards
+default_filters.page=Default Filters
 dependencies.page=Dependencies
-email_configuration.page=Email settings
-event_categories.page=Event categories
+email_configuration.page=Email Settings
+event_categories.page=Event Categories
 filters.page=Filters
-global_roles.page=Global roles
-manual_metrics.page=Manual metrics
-manual_measures.page=Manual measures
-my_profile.page=My profile
-project_roles.page=Project roles
+global_roles.page=Global Roles
+manual_metrics.page=Manual Metrics
+manual_measures.page=Manual Measures
+my_profile.page=My Profile
+project_roles.page=Project Roles
 project_settings.page=Settings
-quality_profiles.page=Quality profiles
+quality_profiles.page=Quality Profiles
 reviews.page=Reviews
-settings.page=Settings
+settings.page=General Settings
 source.page=Source
 system_info.page=System Info
 timemachine.page=Time Machine
 user_groups.page=Groups
 users.page=Users
 violations.page=Violations
-violations_drilldown.page=Violations drilldown
+violations_drilldown.page=Violations Drilldown
 update_center.page=Update Center
 
 
diff --git a/plugins/sonar-pmd-plugin/pom.xml b/plugins/sonar-pmd-plugin/pom.xml
index 7b36d130ff7..84d7233f91b 100644
--- a/plugins/sonar-pmd-plugin/pom.xml
+++ b/plugins/sonar-pmd-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml
index 57f7ee18e47..c86514ec2d9 100644
--- a/plugins/sonar-squid-java-plugin/pom.xml
+++ b/plugins/sonar-squid-java-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.plugins</groupId>
diff --git a/plugins/sonar-surefire-plugin/pom.xml b/plugins/sonar-surefire-plugin/pom.xml
index fd7b35c1c67..7cd6d707563 100644
--- a/plugins/sonar-surefire-plugin/pom.xml
+++ b/plugins/sonar-surefire-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 6a4e5b961a3..8c836b1bad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.sonar</groupId>
   <artifactId>sonar</artifactId>
   <packaging>pom</packaging>
-  <version>2.11-SNAPSHOT</version>
+  <version>2.10-SNAPSHOT</version>
   <name>Sonar</name>
   <url>http://www.sonarsource.org</url>
   <description>Put technical debt under control</description>
@@ -106,7 +105,7 @@
     <jdk.min.version>1.5</jdk.min.version>
 
     <!-- default GWT configuration. It's overridden by the profile 'dev' to speed up compilation in dev environments-->
-    <gwt.permutationSuffix/>
+    <gwt.permutationSuffix />
     <gwt.extraJvmArgs>-Xmx512m -Xss1024k</gwt.extraJvmArgs>
     <sonar.snapshotRepository.url>dav:https://dav.codehaus.org/snapshots.repository/sonar</sonar.snapshotRepository.url>
   </properties>
@@ -1142,7 +1141,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore />
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1155,7 +1154,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore />
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1168,7 +1167,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore />
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1182,7 +1181,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore />
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1195,7 +1194,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore></ignore>
+                        <ignore />
                       </action>
                     </pluginExecution>
                   </pluginExecutions>
diff --git a/samples/pom.xml b/samples/pom.xml
index 1e7308bd051..3b0669ea853 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar.samples</groupId>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index ef66df08615..4b3941e48db 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-application</artifactId>
   <packaging>jar</packaging>
diff --git a/sonar-batch-bootstrapper/pom.xml b/sonar-batch-bootstrapper/pom.xml
index 1da517f33bb..814fe1186b3 100644
--- a/sonar-batch-bootstrapper/pom.xml
+++ b/sonar-batch-bootstrapper/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-batch-bootstrapper</artifactId>
diff --git a/sonar-batch-maven-compat/pom.xml b/sonar-batch-maven-compat/pom.xml
index 47f0b515f1b..2b4c990c717 100644
--- a/sonar-batch-maven-compat/pom.xml
+++ b/sonar-batch-maven-compat/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-batch-maven-compat</artifactId>
diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index f6ab33cf18f..89a6cb4fbaa 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
 
   <groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-channel/pom.xml b/sonar-channel/pom.xml
index 2758b32e6fc..8a1fc5925f7 100644
--- a/sonar-channel/pom.xml
+++ b/sonar-channel/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.codehaus.sonar</groupId>
 		<artifactId>sonar</artifactId>
-		<version>2.11-SNAPSHOT</version>
+		<version>2.10-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>sonar-channel</artifactId>
diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml
index d626cde8e77..5c130b264db 100644
--- a/sonar-check-api/pom.xml
+++ b/sonar-check-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>sonar-check-api</artifactId>
diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml
index ac062366aaa..8e55317bc21 100644
--- a/sonar-colorizer/pom.xml
+++ b/sonar-colorizer/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>sonar-colorizer</artifactId>
diff --git a/sonar-core-maven-plugin/pom.xml b/sonar-core-maven-plugin/pom.xml
index 3f874312722..46a8c5b6686 100644
--- a/sonar-core-maven-plugin/pom.xml
+++ b/sonar-core-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
 
   <!-- do not change, it's used when deploying in sonar internal repository -->
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index 61560744f54..a7de1503e90 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-core</artifactId>
   <name>Sonar :: Core</name>
diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml
index b06320dfa5b..3675c1cd81a 100644
--- a/sonar-deprecated/pom.xml
+++ b/sonar-deprecated/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-deprecated</artifactId>
   <name>Sonar :: Deprecated</name>
diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml
index f2d5d8ce047..3325290dfd6 100644
--- a/sonar-duplications/pom.xml
+++ b/sonar-duplications/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-duplications</artifactId>
   <name>Sonar :: Duplications</name>
diff --git a/sonar-graph/pom.xml b/sonar-graph/pom.xml
index 09606f4d41a..31c82aba65f 100644
--- a/sonar-graph/pom.xml
+++ b/sonar-graph/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-gwt-api/pom.xml b/sonar-gwt-api/pom.xml
index 5386c335fe1..659191e3ee8 100644
--- a/sonar-gwt-api/pom.xml
+++ b/sonar-gwt-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-gwt-api</artifactId>
   <packaging>jar</packaging>
diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml
index 2ff857746f8..42ba5c7932d 100644
--- a/sonar-java-api/pom.xml
+++ b/sonar-java-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-java-api</artifactId>
   <name>Sonar :: Java API</name>
diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml
index b2eab7de4c8..49eb119a576 100644
--- a/sonar-markdown/pom.xml
+++ b/sonar-markdown/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.codehaus.sonar</groupId>
 		<artifactId>sonar</artifactId>
-		<version>2.11-SNAPSHOT</version>
+		<version>2.10-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>sonar-markdown</artifactId>
diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml
index 1516fe7ba70..141b9929000 100644
--- a/sonar-maven-plugin/pom.xml
+++ b/sonar-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml
index ad32b9fd6f2..76e65d0fbd1 100644
--- a/sonar-maven3-plugin/pom.xml
+++ b/sonar-maven3-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-maven3-plugin</artifactId>
   <packaging>maven-plugin</packaging>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 5f562c904e1..dfb994003a5 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-plugin-api</artifactId>
   <packaging>jar</packaging>
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index ef0b4b3ffd7..88a1bb5c25e 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-server</artifactId>
   <packaging>war</packaging>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index e8364f9b06b..871641fa03a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -80,13 +80,13 @@
 
               <li class="h2"><%= message('sidebar.system') -%></li>
               <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>"><a href="<%= ApplicationController.root_context -%>/settings/index"><%= message('settings.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='email_configuration' -%>"><a href="<%= ApplicationController.root_context -%>/email_configuration"><%= message('email_configuration.page') -%></a></li>
               <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup"><%= message('backup.page') -%></a></li>
               <li class="<%= 'selected' if controller.controller_path=='system' -%>"><a href="<%= ApplicationController.root_context -%>/system"><%= message('system_info.page') -%></a></li>
               <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true';
               if update_center_activated=='true' %>
                 <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"><a href="<%= ApplicationController.root_context -%>/updatecenter"><%= message('update_center.page') -%></a></li>
               <% end %>
-              <li class="<%= 'selected' if controller.controller_path=='email_configuration' -%>"><a href="<%= ApplicationController.root_context -%>/email_configuration"><%= message('email_configuration.page') -%></a></li>
             <% end %>
 
         <% end %>
diff --git a/sonar-squid/pom.xml b/sonar-squid/pom.xml
index d92981b1ace..2d0959d3b49 100644
--- a/sonar-squid/pom.xml
+++ b/sonar-squid/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml
index e1ca997cfaf..cb2dca64067 100644
--- a/sonar-testing-harness/pom.xml
+++ b/sonar-testing-harness/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-testing-harness</artifactId>
   <packaging>jar</packaging>
diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml
index f86f2fea36c..313e69d17a5 100644
--- a/sonar-ws-client/pom.xml
+++ b/sonar-ws-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>2.11-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-ws-client</artifactId>
   <packaging>jar</packaging>