From f69f03a2055b4396dfe8b5338007d930cfe3898b Mon Sep 17 00:00:00 2001 From: Emmanuel Hugonnet Date: Thu, 11 Jun 2020 15:53:48 +0200 Subject: [PATCH] ARTEMIS-2109: updating mockito for Java 14 support and working round a javadoc issue --- .../activemq/artemis/jms/bridge/QualityOfServiceMode.java | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java index fdf2aa3587..38ee3d7458 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java @@ -17,9 +17,9 @@ package org.apache.activemq.artemis.jms.bridge; /** - *

Quality of server (QoS) levels

+ *

Quality of server (QoS) levels

* - *

QOS_AT_MOST_ONCE

+ *

QOS_AT_MOST_ONCE

* * 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. * - *

QOS_DUPLICATES_OK

+ *

QOS_DUPLICATES_OK

* * 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. * - *

QOS_ONCE_AND_ONLY_ONCE

+ *

QOS_ONCE_AND_ONLY_ONCE

* * 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 diff --git a/pom.xml b/pom.xml index 92913d2f11..38af255341 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 9.4.26.v20200117 3.6.13.Final 2.4 - 2.25.0 + 3.3.3 2.1.2 4.1.48.Final