From d4b1bfd3608757d162624682a18bae0710d65092 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Fri, 28 Oct 2011 11:11:09 +0200
Subject: [PATCH] SONAR-2584 add support for Java7 in Checkstyle and Squid

---
 plugins/sonar-checkstyle-plugin/pom.xml                     | 6 +++---
 plugins/sonar-squid-java-plugin/pom.xml                     | 6 +++---
 .../test/java/org/sonar/java/ast/JavaAstScannerTest.java    | 2 +-
 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
-- 
2.39.5