SONAR-6517 merge sonar-deprecated into sonar-plugin-api

It allows to use the shaded  and relocated dependencies of sonar-plugin-api

45 files changed, 10 insertions, 61 deletions

diff --git a/pom.xml b/pom.xml
index 20ac8d90088..834e0530cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
     <module>sonar-check-api</module>
     <module>sonar-colorizer</module>
     <module>sonar-core</module>
-    <module>sonar-deprecated</module>
     <module>sonar-duplications</module>
     <module>sonar-graph</module>
     <module>sonar-home</module>
@@ -627,11 +626,6 @@
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
-        <artifactId>sonar-deprecated</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-duplications</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index a912632d83a..5f34c60c1b7 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -90,16 +90,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-deprecated</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-project</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-home</artifactId>
     </dependency>
     <dependency>
@@ -137,6 +127,10 @@
           <groupId>org.apache.maven.shared</groupId>
           <artifactId>maven-common-artifact-filters</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-project</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index c2f0eaf47fd..e6678728b1d 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -49,20 +49,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-deprecated</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jfree</groupId>
-          <artifactId>jcommon</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jfree</groupId>
-          <artifactId>jfreechart</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-home</artifactId>
     </dependency>
     <dependency>
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index 1fb4e03daf2..cc7a1f934db 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -37,20 +37,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-deprecated</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jfree</groupId>
-          <artifactId>jcommon</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jfree</groupId>
-          <artifactId>jfreechart</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-update-center-common</artifactId>
     </dependency>
     <dependency>
diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml
index c250188556e..b1a59d2b825 100644
--- a/sonar-java-api/pom.xml
+++ b/sonar-java-api/pom.xml
@@ -24,20 +24,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-deprecated</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jfree</groupId>
-          <artifactId>jcommon</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jfree</groupId>
-          <artifactId>jfreechart</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 2e37e8f3498..f09e6a254ad 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -24,6 +24,10 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>jfree</groupId>
+      <artifactId>jfreechart</artifactId>
+    </dependency>
+    <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
index 137437fae4f..137437fae4f 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceCreationLock.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceCreationLock.java
index 1b485ddd96d..1b485ddd96d 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceCreationLock.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceCreationLock.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java
index 23ab301d309..23ab301d309 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/SquidUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java
index d215d11b83e..d215d11b83e 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/batch/SquidUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/charts/AbstractChart.java b/sonar-plugin-api/src/main/java/org/sonar/api/charts/AbstractChart.java
index acbeb318b96..acbeb318b96 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/charts/AbstractChart.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/charts/AbstractChart.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/charts/Chart.java b/sonar-plugin-api/src/main/java/org/sonar/api/charts/Chart.java
index fedd88138ce..fedd88138ce 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/charts/Chart.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/charts/Chart.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/charts/ChartParameters.java b/sonar-plugin-api/src/main/java/org/sonar/api/charts/ChartParameters.java
index e898e621f21..e898e621f21 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/charts/ChartParameters.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/charts/ChartParameters.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/charts/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/charts/package-info.java
index 358d4bbef40..358d4bbef40 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/charts/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/charts/package-info.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java
index 1629acf498f..1629acf498f 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/checks/CheckFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java
index c6ad3b45092..c6ad3b45092 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/checks/CheckFactory.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/checks/NoSonarFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java
index 16aa183e3a5..16aa183e3a5 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/checks/NoSonarFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/resources/Java.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Java.java
index 67b27bb4da8..67b27bb4da8 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/resources/Java.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Java.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/resources/JavaFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
index 5d4c3eadff4..5d4c3eadff4 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/resources/JavaFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/resources/JavaPackage.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaPackage.java
index 28909ce0ae9..28909ce0ae9 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/resources/JavaPackage.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaPackage.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/resources/Method.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Method.java
index 0e9b361eed4..0e9b361eed4 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/resources/Method.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Method.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/resources/ProjectUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectUtils.java
index d852edd82d6..d852edd82d6 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/resources/ProjectUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectUtils.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java
index 328b522e7a9..328b522e7a9 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/rules/RuleRepository.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java
index e7725ff73d1..e7725ff73d1 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/rules/RuleRepository.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/rules/XMLRuleParser.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java
index b7a0a3772c3..b7a0a3772c3 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/rules/XMLRuleParser.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java
index addab4dca69..addab4dca69 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/web/Section.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/Section.java
index 2add1884001..2add1884001 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/web/Section.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/Section.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/batch/SquidUtilsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
index 643d24d575e..643d24d575e 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/charts/ChartParametersTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/charts/ChartParametersTest.java
index 7ef39e3b730..7ef39e3b730 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/charts/ChartParametersTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/charts/ChartParametersTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/AbstractCheck.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/AbstractCheck.java
index fbdda5849f6..fbdda5849f6 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/AbstractCheck.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/AbstractCheck.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
index f783eade75f..f783eade75f 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java
index 1e48ebf494e..1e48ebf494e 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithKey.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithKey.java
index 47ac8e601f7..47ac8e601f7 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithKey.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithKey.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java
index 7677ce5f791..7677ce5f791 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java
index f33308bf5b4..f33308bf5b4 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java
index 260fd41779a..260fd41779a 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java
index fd4def57f8d..fd4def57f8d 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java
index b8facf9371a..b8facf9371a 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/ImplementedCheck.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/ImplementedCheck.java
index cb3c78d5793..cb3c78d5793 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/ImplementedCheck.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/ImplementedCheck.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
index 8656fa5d48a..8656fa5d48a 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaFileTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java
index 017e6c4a34b..017e6c4a34b 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaFileTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaPackageTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaPackageTest.java
index 10479b91229..10479b91229 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaPackageTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaPackageTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaTest.java
index f77fba190b1..f77fba190b1 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/resources/MethodTest.java
index 8d8c7b66f80..8d8c7b66f80 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/resources/MethodTest.java
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java
index 79b130ba3fc..6f5f7c9c9bd 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java
@@ -19,15 +19,14 @@
  */
 package org.sonar.api.rules;
 
+import java.util.Collections;
+import java.util.List;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.PropertyType;
 import org.sonar.api.utils.SonarException;
 import org.sonar.check.Priority;
 
-import java.util.Collections;
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class AnnotationRuleParserTest {