Browse Source

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

It allows to use the shaded  and relocated dependencies of sonar-plugin-api
tags/5.2-RC1
Simon Brandhof 9 years ago
parent
commit
a1150367ee
45 changed files with 10 additions and 61 deletions
  1. 0
    6
      pom.xml
  2. 4
    10
      server/sonar-server/pom.xml
  3. 0
    14
      sonar-batch/pom.xml
  4. 0
    14
      sonar-core/pom.xml
  5. 0
    14
      sonar-java-api/pom.xml
  6. 4
    0
      sonar-plugin-api/pom.xml
  7. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
  8. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceCreationLock.java
  9. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java
  10. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java
  11. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/charts/AbstractChart.java
  12. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/charts/Chart.java
  13. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/charts/ChartParameters.java
  14. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/charts/package-info.java
  15. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java
  16. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java
  17. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java
  18. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/resources/Java.java
  19. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
  20. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaPackage.java
  21. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/resources/Method.java
  22. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectUtils.java
  23. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java
  24. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java
  25. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java
  26. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java
  27. 0
    0
      sonar-plugin-api/src/main/java/org/sonar/api/web/Section.java
  28. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
  29. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/charts/ChartParametersTest.java
  30. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/AbstractCheck.java
  31. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
  32. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java
  33. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithKey.java
  34. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java
  35. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java
  36. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java
  37. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java
  38. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java
  39. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/ImplementedCheck.java
  40. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
  41. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java
  42. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaPackageTest.java
  43. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaTest.java
  44. 0
    0
      sonar-plugin-api/src/test/java/org/sonar/api/resources/MethodTest.java
  45. 2
    3
      sonar-plugin-api/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java

+ 0
- 6
pom.xml View File

<module>sonar-check-api</module> <module>sonar-check-api</module>
<module>sonar-colorizer</module> <module>sonar-colorizer</module>
<module>sonar-core</module> <module>sonar-core</module>
<module>sonar-deprecated</module>
<module>sonar-duplications</module> <module>sonar-duplications</module>
<module>sonar-graph</module> <module>sonar-graph</module>
<module>sonar-home</module> <module>sonar-home</module>
<artifactId>sonar-batch-protocol</artifactId> <artifactId>sonar-batch-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-deprecated</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.sonar</groupId> <groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-duplications</artifactId> <artifactId>sonar-duplications</artifactId>

+ 4
- 10
server/sonar-server/pom.xml View File

<groupId>org.codehaus.sonar</groupId> <groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-batch-protocol</artifactId> <artifactId>sonar-batch-protocol</artifactId>
</dependency> </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> <dependency>
<groupId>org.codehaus.sonar</groupId> <groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-home</artifactId> <artifactId>sonar-home</artifactId>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId> <artifactId>maven-common-artifact-filters</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>

+ 0
- 14
sonar-batch/pom.xml View File

<groupId>org.codehaus.sonar</groupId> <groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-batch-protocol</artifactId> <artifactId>sonar-batch-protocol</artifactId>
</dependency> </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> <dependency>
<groupId>org.codehaus.sonar</groupId> <groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-home</artifactId> <artifactId>sonar-home</artifactId>

+ 0
- 14
sonar-core/pom.xml View File

<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
</dependency> </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> <dependency>
<groupId>org.codehaus.sonar</groupId> <groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-update-center-common</artifactId> <artifactId>sonar-update-center-common</artifactId>

+ 0
- 14
sonar-java-api/pom.xml View File

</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>

+ 4
- 0
sonar-plugin-api/pom.xml View File

<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId> <artifactId>jsr305</artifactId>

sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java → sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java View File


sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceCreationLock.java → sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceCreationLock.java View File


sonar-deprecated/src/main/java/org/sonar/api/batch/ResourceFilter.java → sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java View File


sonar-deprecated/src/main/java/org/sonar/api/batch/SquidUtils.java → sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java View File


sonar-deprecated/src/main/java/org/sonar/api/charts/AbstractChart.java → sonar-plugin-api/src/main/java/org/sonar/api/charts/AbstractChart.java View File


sonar-deprecated/src/main/java/org/sonar/api/charts/Chart.java → sonar-plugin-api/src/main/java/org/sonar/api/charts/Chart.java View File


sonar-deprecated/src/main/java/org/sonar/api/charts/ChartParameters.java → sonar-plugin-api/src/main/java/org/sonar/api/charts/ChartParameters.java View File


sonar-deprecated/src/main/java/org/sonar/api/charts/package-info.java → sonar-plugin-api/src/main/java/org/sonar/api/charts/package-info.java View File


sonar-deprecated/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java → sonar-plugin-api/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java View File


sonar-deprecated/src/main/java/org/sonar/api/checks/CheckFactory.java → sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java View File


sonar-deprecated/src/main/java/org/sonar/api/checks/NoSonarFilter.java → sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java View File


sonar-deprecated/src/main/java/org/sonar/api/resources/Java.java → sonar-plugin-api/src/main/java/org/sonar/api/resources/Java.java View File


sonar-deprecated/src/main/java/org/sonar/api/resources/JavaFile.java → sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java View File


sonar-deprecated/src/main/java/org/sonar/api/resources/JavaPackage.java → sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaPackage.java View File


sonar-deprecated/src/main/java/org/sonar/api/resources/Method.java → sonar-plugin-api/src/main/java/org/sonar/api/resources/Method.java View File


sonar-deprecated/src/main/java/org/sonar/api/resources/ProjectUtils.java → sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectUtils.java View File


sonar-deprecated/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java → sonar-plugin-api/src/main/java/org/sonar/api/rules/AnnotationRuleParser.java View File


sonar-deprecated/src/main/java/org/sonar/api/rules/RuleRepository.java → sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java View File


sonar-deprecated/src/main/java/org/sonar/api/rules/XMLRuleParser.java → sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java View File


sonar-deprecated/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java → sonar-plugin-api/src/main/java/org/sonar/api/web/AbstractDashboardWidget.java View File


sonar-deprecated/src/main/java/org/sonar/api/web/Section.java → sonar-plugin-api/src/main/java/org/sonar/api/web/Section.java View File


sonar-deprecated/src/test/java/org/sonar/api/batch/SquidUtilsTest.java → sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/charts/ChartParametersTest.java → sonar-plugin-api/src/test/java/org/sonar/api/charts/ChartParametersTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/AbstractCheck.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/AbstractCheck.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithIntegerProperty.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithKey.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithKey.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithOverriddenPropertyKey.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithPrimitiveProperties.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithStringProperty.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithUnsupportedPropertyType.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/CheckWithoutProperties.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/ImplementedCheck.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/ImplementedCheck.java View File


sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java → sonar-plugin-api/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/resources/JavaFileTest.java → sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/resources/JavaPackageTest.java → sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaPackageTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java → sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java → sonar-plugin-api/src/test/java/org/sonar/api/resources/MethodTest.java View File


sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java → sonar-plugin-api/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java View File

*/ */
package org.sonar.api.rules; package org.sonar.api.rules;


import java.util.Collections;
import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.sonar.api.PropertyType; import org.sonar.api.PropertyType;
import org.sonar.api.utils.SonarException; import org.sonar.api.utils.SonarException;
import org.sonar.check.Priority; import org.sonar.check.Priority;


import java.util.Collections;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;


public class AnnotationRuleParserTest { public class AnnotationRuleParserTest {

Loading…
Cancel
Save