Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-07-03 13:25:11 +01:00
commit 2859d7e649
1 changed files with 2 additions and 2 deletions

View File

@ -75,7 +75,7 @@
<htmlunit.version>2.29</htmlunit.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version>
<httpclient.version>4.5.5</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<httpcore.version>4.4.10</httpcore.version>
<infinispan.version>9.1.7.Final</infinispan.version>
<influxdb-java.version>2.9</influxdb-java.version>
<jackson.version>2.9.6</jackson.version>
@ -186,7 +186,7 @@
<!-- Plugin versions -->
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<git-commit-id-plugin.version>2.2.3</git-commit-id-plugin.version>
<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>