SONARPY-88 Upgrade sslr-squid-bridge to 2.6v

vilchik-elena · vilchik-elena · commit 0d33662cc00e · 2015-03-25T15:49:53.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -114,7 +114,7 @@
       <dependency>
         <groupId>org.codehaus.sonar.sslr-squid-bridge</groupId>
         <artifactId>sslr-squid-bridge</artifactId>
-        <version>2.5.3</version>
+        <version>2.6</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
@@ -136,11 +136,6 @@
         <artifactId>logback-classic</artifactId>
         <version>0.9.15</version>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.sonar.common-rules</groupId>
-        <artifactId>sonar-common-rules</artifactId>
-        <version>1.2</version>
-      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
diff --git a/sonar-python-plugin/pom.xml b/sonar-python-plugin/pom.xml
@@ -50,11 +50,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.codehaus.sonar.common-rules</groupId>
-      <artifactId>sonar-common-rules</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.codehaus.sonar.sslr</groupId>
       <artifactId>sslr-testing-harness</artifactId>
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonCommonRulesEngine.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonCommonRulesEngine.java
@@ -19,8 +19,8 @@
  */
 package org.sonar.plugins.python;
 
-import org.sonar.commonrules.api.CommonRulesEngine;
-import org.sonar.commonrules.api.CommonRulesRepository;
+import org.sonar.squidbridge.commonrules.api.CommonRulesEngine;
+import org.sonar.squidbridge.commonrules.api.CommonRulesRepository;
 
 public class PythonCommonRulesEngine extends CommonRulesEngine {
 
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonCommonRulesEngineTest.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonCommonRulesEngineTest.java
@@ -20,7 +20,7 @@
 package org.sonar.plugins.python;
 
 import org.junit.Test;
-import org.sonar.commonrules.api.CommonRulesRepository;
+import org.sonar.squidbridge.commonrules.api.CommonRulesRepository;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -36,8 +36,8 @@ public void shouldProvideExpectedExtensions() {
   public void enable_common_rules() {
     PythonCommonRulesEngine engine = new PythonCommonRulesEngine();
     CommonRulesRepository repo = engine.newRepository();
-    assertThat(repo.rules()).hasSize(4);
-    assertThat(repo.rule(CommonRulesRepository.RULE_INSUFFICIENT_COMMENT_DENSITY)).isNotNull();
+    assertThat(repo.enabledRuleKeys()).hasSize(4);
+    assertThat(repo.enableInsufficientCommentDensityRule(null)).isNotNull();
   }
 
 }
diff --git a/sslr-python-toolkit/pom.xml b/sslr-python-toolkit/pom.xml
@@ -105,7 +105,7 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <maxsize>3100000</maxsize>
+                  <maxsize>3200000</maxsize>
                   <minsize>1400000</minsize>
                   <files>
                     <file>${project.build.directory}/${project.build.finalName}.jar</file>
