Merge branch 'master' of https://github.com/SonarSource/sonarqube

# By Julien Lancelot (2) and Stas Vilchik (1)
# Via Stas Vilchik
* 'master' of https://github.com/SonarSource/sonarqube:
  Component Viewer: duplications
  Ignore some failing tests
  Fix licence headers

Conflicts:
	sonar-core/src/main/java/org/sonar/core/cluster/LocalNonBlockingWorkQueue.java
	sonar-server/src/main/java/org/sonar/server/rule2/RuleConstants.java
	sonar-server/src/main/java/org/sonar/server/rule2/RuleDao.java
	sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
	sonar-server/src/test/java/org/sonar/server/rule2/RuleIndexTest.java

1 files changed, 2 insertions, 4 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
index 8b6aaf45095..152447530c9 100644
--- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.core.rule;
 
-import org.sonar.core.cluster.WorkQueue;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -32,14 +30,14 @@ import org.sonar.api.rule.Severity;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.check.Cardinality;
+import org.sonar.core.cluster.WorkQueue;
 import org.sonar.core.persistence.AbstractDaoTestCase;
 
 import java.util.List;
 
-import static org.mockito.Mockito.mock;
-
 import static com.google.common.collect.Lists.newArrayList;
 import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 public class RuleDaoTest extends AbstractDaoTestCase {