8 files changed, 6 insertions, 31 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
index 0f87bd60d88..443b139303a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
@@ -46,7 +46,7 @@ import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.SonarException;
 import org.sonar.api.utils.System2;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.rule.RuleKeyFunctions;
+import org.sonar.server.rule.RuleKeyFunctions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 5d8d9a2c3f3..b3fb5a407a7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -36,7 +36,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.utils.Paging;
-import org.sonar.core.rule.RuleKeyFunctions;
+import org.sonar.server.rule.RuleKeyFunctions;
 import org.sonar.server.es.Facets;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.es.SearchResult;
diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleKeyFunctions.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleKeyFunctions.java
index d7fae9d920a..63410f5f094 100644
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleKeyFunctions.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleKeyFunctions.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.rule;
+package org.sonar.server.rule;
 
 import com.google.common.base.Function;
 import javax.annotation.Nonnull;
diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleKeyFunctionsTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleKeyFunctionsTest.java
index 909b3a9fffc..7975845eeb0 100644
--- a/sonar-core/src/test/java/org/sonar/core/rule/RuleKeyFunctionsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleKeyFunctionsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.rule;
+package org.sonar.server.rule;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/sonar-core/src/main/java/org/sonar/core/rule/package-info.java b/sonar-core/src/main/java/org/sonar/core/rule/package-info.java
deleted file mode 100644
index 2b945fd258e..00000000000
--- a/sonar-core/src/main/java/org/sonar/core/rule/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.core.rule;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
diff --git a/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDto.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDto.java
index 124a5413318..17aa911ad9d 100644
--- a/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDto.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rules.ActiveRule;
-import org.sonar.core.rule.SeverityUtil;
+import org.sonar.db.rule.SeverityUtil;
 import org.sonar.db.Dto;
 import org.sonar.db.rule.RuleDto;
 
diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
index 84735d6c05d..62e85dec94f 100644
--- a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
@@ -33,7 +33,6 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
-import org.sonar.core.rule.SeverityUtil;
 import org.sonar.db.Dto;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/sonar-core/src/main/java/org/sonar/core/rule/SeverityUtil.java b/sonar-db/src/main/java/org/sonar/db/rule/SeverityUtil.java
index a226ccb8fef..4ea7258f043 100644
--- a/sonar-core/src/main/java/org/sonar/core/rule/SeverityUtil.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/SeverityUtil.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.rule;
+package org.sonar.db.rule;
 
 import org.sonar.api.rule.Severity;