diff options
| author | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-11-30 10:55:26 +0400 |
|---|---|---|
| committer | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-11-30 14:10:37 +0400 |
| commit | 3243252e10fd86b2ba845d287e3ef0058955385f (patch) | |
| tree | 9bd81b5ee8a58c31f811637ea4b6a846f3a92824 /plugins/sonar-squid-java-plugin | |
| parent | 39768a567bdf6e52316e51c665cfead5a7128c25 (diff) | |
| download | sonarqube-3243252e10fd86b2ba845d287e3ef0058955385f.tar.gz sonarqube-3243252e10fd86b2ba845d287e3ef0058955385f.zip | |
SONAR-1836 Upgrade to Checkstyle 5.5
New rules in 5.2:
* InnerTypeLast
Modified rules in 5.2:
* DeclarationOrder
* ImportOrder
New rules in 5.3:
* OuterTypeFilename
* NestedForDepth
* MethodCount
* OneStatementPerLine
Modified rules in 5.3:
* PackageDeclaration
* MagicNumber
* AbstractClassName
* AvoidStarImport
Modified rules in 5.4:
* UnusedImports
* MagicNumber
* EqualsAvoidNull
* IllegalThrows
* RedundantModifier
Diffstat (limited to 'plugins/sonar-squid-java-plugin')
| -rw-r--r-- | plugins/sonar-squid-java-plugin/pom.xml | 40 | ||||
| -rw-r--r-- | plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/CheckstyleSquidBridge.java | 2 |
2 files changed, 9 insertions, 33 deletions
diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml index 03548eb8a63..28282882569 100644 --- a/plugins/sonar-squid-java-plugin/pom.xml +++ b/plugins/sonar-squid-java-plugin/pom.xml @@ -13,21 +13,6 @@ <name>Sonar :: Plugins :: Squid Java</name> <description>Squid analyzer for Java.</description> - <repositories> - <!-- for checkstyle 5.1.x --> - <repository> - <id>sonar</id> - <name>Sonar</name> - <url>http://repository.sonarsource.org/content/repositories/sonar</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <dependencies> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -55,9 +40,9 @@ <version>3.2</version> </dependency> <dependency> - <groupId>com.sonarsource.checkstyle</groupId> - <artifactId>checkstyle-java7</artifactId> - <version>5.1.2</version> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>5.5</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -73,6 +58,11 @@ <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils-core</artifactId> </exclusion> + <exclusion> + <!-- Checkstyle 5.5 declares this dependency, whereas 5.1 not --> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -101,20 +91,6 @@ <build> <plugins> <plugin> - <!-- TODO remove (see SONAR-2938) --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-no-repositories</id> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> <configuration> diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/CheckstyleSquidBridge.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/CheckstyleSquidBridge.java index 9de6058b3b6..e898d4e6606 100644 --- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/CheckstyleSquidBridge.java +++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/CheckstyleSquidBridge.java @@ -72,7 +72,7 @@ public class CheckstyleSquidBridge extends Check { public static void setInputFiles(Collection<InputFile> inputFiles) { inputFilesByPath.clear(); for (InputFile inputFile : inputFiles) { - inputFilesByPath.put(inputFile.getFile(), inputFile); + inputFilesByPath.put(inputFile.getFile().getAbsoluteFile(), inputFile); } } |