Commit 3febf56e authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.1.x'

parents f90bfff1 48c83b04
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<netty.version>4.1.33.Final</netty.version> <netty.version>4.1.33.Final</netty.version>
<netty-tcnative.version>2.0.20.Final</netty-tcnative.version> <netty-tcnative.version>2.0.20.Final</netty-tcnative.version>
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.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> <postgresql.version>42.2.5</postgresql.version>
<prometheus-pushgateway.version>0.6.0</prometheus-pushgateway.version> <prometheus-pushgateway.version>0.6.0</prometheus-pushgateway.version>
<quartz.version>2.3.0</quartz.version> <quartz.version>2.3.0</quartz.version>
...@@ -2459,7 +2459,7 @@ ...@@ -2459,7 +2459,7 @@
<dependency> <dependency>
<groupId>org.messaginghub</groupId> <groupId>org.messaginghub</groupId>
<artifactId>pooled-jms</artifactId> <artifactId>pooled-jms</artifactId>
<version>${pooled-jms-version}</version> <version>${pooled-jms.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment