Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #809 from jbonofre/AMQ-8561 

[AMQ-8561] Add missing jetty-webapp dependency in activemq-web
This commit is contained in:
Jean-Baptiste Onofré 2022-04-06 07:43:26 +02:00 committed by GitHub
parent 4ae145352b ffab5274a4
commit 3f454600e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
View File

@ -129,8 +129,9 @@ public class OfflineDurableSubscriberTimeoutTest extends org.apache.activemq.Tes
@Override @Override
public void append(LogEvent event) { public void append(LogEvent event) {
if (event.getLevel().isMoreSpecificThan(Level.WARN) && if (event.getLevel().isMoreSpecificThan(Level.WARN) &&
!event.getMessage().getFormattedMessage().contains("Store limit")) { !event.getMessage().getFormattedMessage().contains("Store limit") &&
LOG.info("received unexpected log message: " + event.getMessage()); !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); foundLogMessage.set(true);
} }
} }

4
activemq-web/pom.xml
View File

@ -86,6 +86,10 @@
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId> <artifactId>websocket-server</artifactId>