SONAR-2584 add support for Java7 in Checkstyle and Squid

diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml
index d77722f6d669b46425d428df28e982b1b504a70e..355213ec3f72b10cff4c5629c9a36828319372a6 100644 (file)
--- 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 e3920ee4d9bbc6db7627e59dc1ed8d2fe8e765c7..c7069da1064742b060bce1e47a987f7283281a17 100644 (file)
--- 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 12f38e5cfccc0c78f41e50e2467e48fe5ced3345..833b7064adf18fd5e77699ea7bcb88c966b1fc3f 100644 (file)
--- 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