This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new fbbd3d4cab ARTEMIS-5614 Bump jetty.version from 12.0.25 to 12.1.0
fbbd3d4cab is described below
commit fbbd3d4cab484fef24bc7813dbc0512343ef56b3
Author: Justin Bertram <[email protected]>
AuthorDate: Tue Aug 19 15:06:43 2025 -0500
ARTEMIS-5614 Bump jetty.version from 12.0.25 to 12.1.0
---
.../activemq/artemis/component/WebServerComponent.java | 15 ++++++++++-----
pom.xml | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index 9ecc2dc6f3..5ed409e34d 100644
---
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.ThreadFactory;
import java.util.stream.Collectors;
@@ -375,11 +376,15 @@ public class WebServerComponent implements
ExternalComponent, WebServerComponent
scanner.setReportDirs(false);
scanner.setReportExistingFilesOnStartup(false);
scanner.setScanDepth(1);
- scanner.addListener((Scanner.BulkListener) filenames -> {
- for (String filename: filenames) {
- List<Runnable> tasks = scannerTasks.get(filename);
- if (tasks != null) {
- tasks.forEach(t -> t.run());
+ scanner.addListener(new Scanner.BulkListener() {
+ @Override
+ public void pathsChanged(Map<Path, Scanner.Notification>
changeSet) throws Exception {
+ Set<String> filenames =
changeSet.keySet().stream().map(Path::toString).collect(Collectors.toSet());
+ for (String filename: filenames) {
+ List<Runnable> tasks = scannerTasks.get(filename);
+ if (tasks != null) {
+ tasks.forEach(t -> t.run());
+ }
}
}
});
diff --git a/pom.xml b/pom.xml
index 66f699a429..ee1a1ac6d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<caffeine.version>3.2.2</caffeine.version>
<guava.version>33.4.8-jre</guava.version>
<jsr305.version>3.0.2</jsr305.version>
- <jetty.version>12.0.25</jetty.version>
+ <jetty.version>12.1.0</jetty.version>
<jetty-servlet-api.version>5.0.2</jetty-servlet-api.version>
<jgroups.version>5.3.13.Final</jgroups.version>
<errorprone.version>2.41.0</errorprone.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
