diff --git a/cxx-checks/pom.xml b/cxx-checks/pom.xml
index 7cc2681f4e..3717cd7b59 100644
--- a/cxx-checks/pom.xml
+++ b/cxx-checks/pom.xml
@@ -46,9 +46,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-    	<groupId>commons-lang</groupId>
-    	<artifactId>commons-lang</artifactId>
-    	<scope>test</scope>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/cxx-lint/pom.xml b/cxx-lint/pom.xml
index a6bb75aa09..dbc45b8cf2 100644
--- a/cxx-lint/pom.xml
+++ b/cxx-lint/pom.xml
@@ -19,26 +19,25 @@
       <artifactId>cxx-checks</artifactId>
       <version>${project.version}</version>
     </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <scope>runtime</scope>
-      </dependency>
-     <dependency>
-       <groupId>commons-io</groupId>
-       <artifactId>commons-io</artifactId>
-       <version>2.5</version>
-     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.4</version>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
diff --git a/cxx-sensors/pom.xml b/cxx-sensors/pom.xml
index d7eb01326c..49c248c3ab 100644
--- a/cxx-sensors/pom.xml
+++ b/cxx-sensors/pom.xml
@@ -75,15 +75,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-       <groupId>com.google.guava</groupId>
-       <artifactId>guava</artifactId>
-       <version>10.0.1</version>
-      </dependency>
-     <dependency>
-       <groupId>commons-io</groupId>
-       <artifactId>commons-io</artifactId>
-       <version>2.5</version>
-     </dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
@@ -102,7 +101,7 @@
     </dependency>
     <!-- https://mvnrepository.com/artifact/com.googlecode.plist/dd-plist -->
     <dependency>
-    <groupId>com.googlecode.plist</groupId>
+      <groupId>com.googlecode.plist</groupId>
       <artifactId>dd-plist</artifactId>
       <version>1.19</version>
     </dependency>
diff --git a/cxx-squid/pom.xml b/cxx-squid/pom.xml
index 85d7725c79..d8c92da249 100644
--- a/cxx-squid/pom.xml
+++ b/cxx-squid/pom.xml
@@ -26,13 +26,15 @@
       <artifactId>sslr-squid-bridge</artifactId>
     </dependency>
 
-
-
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+      
     <dependency>
       <groupId>org.sonarsource.sslr</groupId>
       <artifactId>sslr-testing-harness</artifactId>
diff --git a/pom.xml b/pom.xml
index 39918e2894..b283779b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
     <license.mailto>http://github.com/SonarOpenCommunity/sonar-cxx</license.mailto>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <sonar.version>5.6</sonar.version>
-    <sslr.version>1.21</sslr.version>
+    <sslr.version>1.22</sslr.version>
     <sslr-squid-bridge.version>2.6.1</sslr-squid-bridge.version>
     <sonar.artifact.path>target/${project.artifactId}-${project.version}.jar</sonar.artifact.path>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -194,6 +194,11 @@
         <artifactId>commons-lang</artifactId>
         <version>2.6</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>19.0</version>
+      </dependency>      
       <dependency>
         <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-testing-harness</artifactId>
@@ -334,7 +339,7 @@
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
           <version>3.2</version>
-      </plugin>
+        </plugin>
       </plugins>
     </pluginManagement>
     <!-- To use the plugin goals in your POM or parent POM -->
diff --git a/sonar-c-plugin/pom.xml b/sonar-c-plugin/pom.xml
index 12bfd5b611..3155fe629f 100644
--- a/sonar-c-plugin/pom.xml
+++ b/sonar-c-plugin/pom.xml
@@ -59,7 +59,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0.9</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -87,19 +86,17 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-       <groupId>com.google.guava</groupId>
-       <artifactId>guava</artifactId>
-       <version>10.0.1</version>
-      </dependency>
-     <dependency>
-       <groupId>commons-io</groupId>
-       <artifactId>commons-io</artifactId>
-       <version>2.5</version>
-     </dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
       <type>jar</type>
     </dependency>
     <dependency>
diff --git a/sonar-cxx-plugin/pom.xml b/sonar-cxx-plugin/pom.xml
index 4e7614ebcb..3789594706 100644
--- a/sonar-cxx-plugin/pom.xml
+++ b/sonar-cxx-plugin/pom.xml
@@ -58,7 +58,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0.9</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -86,19 +85,17 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-       <groupId>com.google.guava</groupId>
-       <artifactId>guava</artifactId>
-       <version>10.0.1</version>
-      </dependency>
-     <dependency>
-       <groupId>commons-io</groupId>
-       <artifactId>commons-io</artifactId>
-       <version>2.5</version>
-     </dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
       <type>jar</type>
     </dependency>
     <dependency>