Merge branch '4.x.x-stable' into 5.2.x-stable

acogoluegnes · acogoluegnes · commit 8fedb6440ad0 · 2018-03-19T15:59:17.000+01:00
Conflicts:
	pom.xml
diff --git a/pom.xml b/pom.xml
@@ -55,13 +55,13 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <slf4j.version>1.7.25</slf4j.version>
-    <metrics.version>3.2.4</metrics.version>
+    <metrics.version>3.2.6</metrics.version>
+    <micrometer.version>1.0.2</micrometer.version>
     <logback.version>1.2.3</logback.version>
-    <micrometer.version>1.0.0</micrometer.version>
     <commons-cli.version>1.1</commons-cli.version>
     <junit.version>4.12</junit.version>
-    <awaitility.version>3.0.0</awaitility.version>
-    <mockito.version>2.10.0</mockito.version>
+    <awaitility.version>3.1.0</awaitility.version>
+    <mockito.version>2.16.0</mockito.version>
 
     <maven.javadoc.plugin.version>3.0.0</maven.javadoc.plugin.version>
     <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
