SONARPY-213 Upgrade SSLR to 1.22 (SonarSource#118)

pynicolas · web-flow · commit 83b68fd5e2bf · 2017-12-22T10:35:30.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -90,8 +90,8 @@
     <sonar.version>6.2</sonar.version>
     <sonar.orchestrator.version>3.14.0.887</sonar.orchestrator.version>
     <sonarlint-core.version>2.4.1</sonarlint-core.version>
-    <sslr.version>1.21</sslr.version>
-    <sslr.xpath.version>1.20</sslr.xpath.version>
+    <sslr.version>1.22</sslr.version>
+    <sslr.xpath.version>1.22</sslr.xpath.version>
     <woodstox.version>4.4.1</woodstox.version>
   </properties>
 
@@ -115,7 +115,7 @@
         <version>${sslr.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.sonar.sslr</groupId>
+        <groupId>org.sonarsource.sslr</groupId>
         <artifactId>sslr-xpath</artifactId>
         <version>${sslr.xpath.version}</version>
       </dependency>
@@ -159,6 +159,11 @@
         <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>22.0</version>
+      </dependency>
 
       <!-- test dependencies -->
       <dependency>
diff --git a/python-squid/pom.xml b/python-squid/pom.xml
@@ -18,9 +18,13 @@
       <artifactId>sslr-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar.sslr</groupId>
+      <groupId>org.sonarsource.sslr</groupId>
       <artifactId>sslr-xpath</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/sonar-python-plugin/pom.xml b/sonar-python-plugin/pom.xml
@@ -116,8 +116,8 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <minsize>3500000</minsize>
-                  <maxsize>3700000</maxsize>
+                  <minsize>4600000</minsize>
+                  <maxsize>4700000</maxsize>
                   <files>
                     <file>${project.build.directory}/${project.build.finalName}.jar</file>
                   </files>
diff --git a/sslr-python-toolkit/pom.xml b/sslr-python-toolkit/pom.xml
@@ -100,8 +100,8 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <maxsize>3300000</maxsize>
-                  <minsize>1400000</minsize>
+                  <maxsize>3900000</maxsize>
+                  <minsize>3800000</minsize>
                   <files>
                     <file>${project.build.directory}/${project.build.finalName}.jar</file>
                   </files>
