ARTEMIS-2109: updating mockito for Java 14 support and working round a javadoc issue

This commit is contained in:
Emmanuel Hugonnet 2020-06-11 15:53:48 +02:00 committed by Robbie Gemmell
parent 502bfcfc56
commit f69f03a205
2 changed files with 5 additions and 5 deletions

View File

@ -17,9 +17,9 @@
package org.apache.activemq.artemis.jms.bridge;
/**
* <h3>Quality of server (QoS) levels</h3>
* <h2>Quality of server (QoS) levels</h2>
*
* <h4>QOS_AT_MOST_ONCE</h4>
* <h3>QOS_AT_MOST_ONCE</h3>
*
* With this QoS mode messages will reach the destination from the source at
* most once. The messages are consumed from the source and acknowledged before
@ -28,7 +28,7 @@ package org.apache.activemq.artemis.jms.bridge;
* destination they could be lost. Hence delivery will occur at most once. This
* mode is available for both persistent and non persistent messages.
*
* <h4>QOS_DUPLICATES_OK</h4>
* <h3>QOS_DUPLICATES_OK</h3>
*
* With this QoS mode, the messages are consumed from the source and then
* acknowledged after they have been successfully sent to the destination.
@ -38,7 +38,7 @@ package org.apache.activemq.artemis.jms.bridge;
* failure. This mode is available for both persistent and non persistent
* messages.
*
* <h4>QOS_ONCE_AND_ONLY_ONCE</h4>
* <h3>QOS_ONCE_AND_ONLY_ONCE</h3>
*
* This QoS mode ensures messages will reach the destination from the source
* once and only once. (Sometimes this mode is known as "exactly once"). If both

View File

@ -95,7 +95,7 @@
<jetty.version>9.4.26.v20200117</jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>2.25.0</mockito.version>
<mockito.version>3.3.3</mockito.version>
<jctools.version>2.1.2</jctools.version>
<netty.version>4.1.48.Final</netty.version>