From a1150367ee755be95f1cc605df983a928aa9136b Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sun, 17 May 2015 16:00:59 +0200 Subject: [PATCH] SONAR-6517 merge sonar-deprecated into sonar-plugin-api It allows to use the shaded and relocated dependencies of sonar-plugin-api --- pom.xml | 6 ------ server/sonar-server/pom.xml | 14 ++++---------- sonar-batch/pom.xml | 14 -------------- sonar-core/pom.xml | 14 -------------- sonar-java-api/pom.xml | 14 -------------- sonar-plugin-api/pom.xml | 4 ++++ .../sonar/api/batch/AbstractSourceImporter.java | 0 .../org/sonar/api/batch/ResourceCreationLock.java | 0 .../java/org/sonar/api/batch/ResourceFilter.java | 0 .../main/java/org/sonar/api/batch/SquidUtils.java | 0 .../java/org/sonar/api/charts/AbstractChart.java | 0 .../src/main/java/org/sonar/api/charts/Chart.java | 0 .../java/org/sonar/api/charts/ChartParameters.java | 0 .../java/org/sonar/api/charts/package-info.java | 0 .../sonar/api/checks/AnnotationCheckFactory.java | 0 .../java/org/sonar/api/checks/CheckFactory.java | 0 .../java/org/sonar/api/checks/NoSonarFilter.java | 0 .../main/java/org/sonar/api/resources/Java.java | 0 .../java/org/sonar/api/resources/JavaFile.java | 0 .../java/org/sonar/api/resources/JavaPackage.java | 0 .../main/java/org/sonar/api/resources/Method.java | 0 .../java/org/sonar/api/resources/ProjectUtils.java | 0 .../org/sonar/api/rules/AnnotationRuleParser.java | 0 .../java/org/sonar/api/rules/RuleRepository.java | 0 .../java/org/sonar/api/rules/XMLRuleParser.java | 0 .../org/sonar/api/web/AbstractDashboardWidget.java | 0 .../src/main/java/org/sonar/api/web/Section.java | 0 .../java/org/sonar/api/batch/SquidUtilsTest.java | 0 .../org/sonar/api/charts/ChartParametersTest.java | 0 .../java/org/sonar/api/checks/AbstractCheck.java | 0 .../api/checks/AnnotationCheckFactoryTest.java | 0 .../sonar/api/checks/CheckWithIntegerProperty.java | 0 .../java/org/sonar/api/checks/CheckWithKey.java | 0 .../api/checks/CheckWithOverriddenPropertyKey.java | 0 .../api/checks/CheckWithPrimitiveProperties.java | 0 .../sonar/api/checks/CheckWithStringProperty.java | 0 .../checks/CheckWithUnsupportedPropertyType.java | 0 .../sonar/api/checks/CheckWithoutProperties.java | 0 .../org/sonar/api/checks/ImplementedCheck.java | 0 .../org/sonar/api/checks/NoSonarFilterTest.java | 0 .../java/org/sonar/api/resources/JavaFileTest.java | 0 .../org/sonar/api/resources/JavaPackageTest.java | 0 .../java/org/sonar/api/resources/JavaTest.java | 0 .../java/org/sonar/api/resources/MethodTest.java | 0 .../sonar/api/rules/AnnotationRuleParserTest.java | 5 ++--- 45 files changed, 10 insertions(+), 61 deletions(-) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/batch/ResourceCreationLock.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/batch/ResourceFilter.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/batch/SquidUtils.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/charts/AbstractChart.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/charts/Chart.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/charts/ChartParameters.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/charts/package-info.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/checks/CheckFactory.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/checks/NoSonarFilter.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/resources/Java.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/resources/JavaFile.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/resources/JavaPackage.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/resources/Method.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/resources/ProjectUtils.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/rules/RuleRepository.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/rules/XMLRuleParser.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/main/java/org/sonar/api/web/Section.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/batch/SquidUtilsTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/charts/ChartParametersTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/AbstractCheck.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithKey.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/ImplementedCheck.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/resources/JavaFileTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/resources/JavaPackageTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/resources/JavaTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/resources/MethodTest.java (100%) rename {sonar-deprecated => sonar-plugin-api}/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java (99%) diff --git a/pom.xml b/pom.xml index 20ac8d90088..834e0530cfe 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ sonar-check-api sonar-colorizer sonar-core - sonar-deprecated sonar-duplications sonar-graph sonar-home @@ -625,11 +624,6 @@ sonar-batch-protocol ${project.version} - - org.codehaus.sonar - sonar-deprecated - ${project.version} - org.codehaus.sonar sonar-duplications 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 @@ -88,16 +88,6 @@ org.codehaus.sonar sonar-batch-protocol - - org.codehaus.sonar - sonar-deprecated - - - org.apache.maven - maven-project - - - org.codehaus.sonar sonar-home @@ -137,6 +127,10 @@ org.apache.maven.shared maven-common-artifact-filters + + org.apache.maven + maven-project + 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 @@ -47,20 +47,6 @@ org.codehaus.sonar sonar-batch-protocol - - org.codehaus.sonar - sonar-deprecated - - - jfree - jcommon - - - jfree - jfreechart - - - org.codehaus.sonar sonar-home 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 @@ -35,20 +35,6 @@ org.mybatis mybatis - - org.codehaus.sonar - sonar-deprecated - - - jfree - jcommon - - - jfree - jfreechart - - - org.codehaus.sonar sonar-update-center-common 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 @@ -23,20 +23,6 @@ - - org.codehaus.sonar - sonar-deprecated - - - jfree - jcommon - - - jfree - jfreechart - - - commons-lang commons-lang 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 @@ -23,6 +23,10 @@ gson provided + + jfree + jfreechart + com.google.code.findbugs jsr305 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceCreationLock.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceFilter.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/batch/SquidUtils.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/charts/AbstractChart.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/charts/Chart.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/charts/ChartParameters.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/charts/package-info.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/checks/CheckFactory.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/checks/NoSonarFilter.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/resources/Java.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/resources/JavaFile.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/resources/JavaPackage.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/resources/Method.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/resources/ProjectUtils.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/rules/RuleRepository.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/rules/XMLRuleParser.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java rename to 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 similarity index 100% rename from sonar-deprecated/src/main/java/org/sonar/api/web/Section.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/batch/SquidUtilsTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/charts/ChartParametersTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/AbstractCheck.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithKey.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/ImplementedCheck.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/resources/JavaFileTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/resources/JavaPackageTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java rename to 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 similarity index 100% rename from sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java rename to 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 similarity index 99% rename from sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java rename to 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 { -- 2.39.5