aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-10-28 11:11:09 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2011-10-28 15:00:01 +0200
commitd4b1bfd3608757d162624682a18bae0710d65092 (patch)
treed7d40b9851e4d0cf968e135b7833677d15d9eed7
parent665638b32ba5fc39528e54b39a2f880debc21c3a (diff)
downloadsonarqube-d4b1bfd3608757d162624682a18bae0710d65092.tar.gz
sonarqube-d4b1bfd3608757d162624682a18bae0710d65092.zip
SONAR-2584 add support for Java7 in Checkstyle and Squid
-rw-r--r--plugins/sonar-checkstyle-plugin/pom.xml6
-rw-r--r--plugins/sonar-squid-java-plugin/pom.xml6
-rw-r--r--plugins/sonar-squid-java-plugin/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java2
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml
index d77722f6d66..355213ec3f7 100644
--- a/plugins/sonar-checkstyle-plugin/pom.xml
+++ b/plugins/sonar-checkstyle-plugin/pom.xml
@@ -14,7 +14,7 @@
<description>Checkstyle is a code analyser to help programmers write Java code that adheres to a coding standard.</description>
<properties>
- <checkstyle.version>5.1</checkstyle.version>
+ <checkstyle.version>5.1.1</checkstyle.version>
</properties>
<repositories>
@@ -39,8 +39,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>checkstyle</groupId>
- <artifactId>checkstyle</artifactId>
+ <groupId>com.sonarsource.checkstyle</groupId>
+ <artifactId>checkstyle-java7</artifactId>
<version>${checkstyle.version}</version>
<exclusions>
<exclusion>
diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml
index e3920ee4d9b..c7069da1064 100644
--- a/plugins/sonar-squid-java-plugin/pom.xml
+++ b/plugins/sonar-squid-java-plugin/pom.xml
@@ -55,9 +55,9 @@
<version>3.2</version>
</dependency>
<dependency>
- <groupId>checkstyle</groupId>
- <artifactId>checkstyle</artifactId>
- <version>5.1</version>
+ <groupId>com.sonarsource.checkstyle</groupId>
+ <artifactId>checkstyle-java7</artifactId>
+ <version>5.1.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/plugins/sonar-squid-java-plugin/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java b/plugins/sonar-squid-java-plugin/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java
index 12f38e5cfcc..833b7064adf 100644
--- a/plugins/sonar-squid-java-plugin/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java
+++ b/plugins/sonar-squid-java-plugin/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java
@@ -70,7 +70,7 @@ public class JavaAstScannerTest {
/**
* SONAR-1908
*/
- @Test(expected = AnalysisException.class)
+ @Test
public void testUnicodeEscape() {
// see
// https://sourceforge.net/tracker/?func=detail&aid=3296452&group_id=29721&atid=397078