From 2959d800fe8daf15d8a885d43605672ca7e9b81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Thu, 31 Mar 2022 21:54:59 +0200
Subject: [PATCH 1/2] [AMQ-8561] Add missing jetty-webapp dependency in
 activemq-web

---
 activemq-web/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index a2df75a867..12bf96eaf4 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -86,6 +86,10 @@
       <artifactId>jetty-server</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>

From ffab5274a441c097a2a54d9aac43025edc147061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Sat, 2 Apr 2022 06:41:51 +0200
Subject: [PATCH 2/2] Fix OfflineDurableSubscriberTimeoutTest on some machine
 (including Jenkins)

---
 .../usecases/OfflineDurableSubscriberTimeoutTest.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
index 49ea5c547b..7c1e9d8650 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
@@ -129,8 +129,9 @@ public class OfflineDurableSubscriberTimeoutTest extends org.apache.activemq.Tes
             @Override
             public void append(LogEvent event) {
                 if (event.getLevel().isMoreSpecificThan(Level.WARN) &&
-                    !event.getMessage().getFormattedMessage().contains("Store limit")) {
-                    LOG.info("received unexpected log message: " + event.getMessage());
+                    !event.getMessage().getFormattedMessage().contains("Store limit") &&
+                    !event.getMessage().getFormattedMessage().contains("resetting to 70% of maximum available")) {
+                    LOG.info("** received unexpected log message: " + event.getMessage().getFormattedMessage() + " [" + event.getLoggerName() + "] (" + event.getLevel().toString() + ")");
                     foundLogMessage.set(true);
                 }
             }