Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-03-04 15:13:05 +01:00
commit 3febf56e93
1 changed files with 2 additions and 2 deletions

View File

@ -141,7 +141,7 @@
<netty.version>4.1.33.Final</netty.version>
<netty-tcnative.version>2.0.20.Final</netty-tcnative.version>
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
<pooled-jms-version>1.0.4</pooled-jms-version>
<pooled-jms.version>1.0.4</pooled-jms.version>
<postgresql.version>42.2.5</postgresql.version>
<prometheus-pushgateway.version>0.6.0</prometheus-pushgateway.version>
<quartz.version>2.3.0</quartz.version>
@ -2459,7 +2459,7 @@
<dependency>
<groupId>org.messaginghub</groupId>
<artifactId>pooled-jms</artifactId>
<version>${pooled-jms-version}</version>
<version>${pooled-jms.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>