From 2cc945e46b728bb02d9361e0a9b13f631b86ec58 Mon Sep 17 00:00:00 2001 From: Kal Ahmed Date: Thu, 13 Aug 2026 10:53:50 +0100 Subject: [PATCH 1/2] Update transitive dependency on micrometer-core 1.15.4 -> 1.15.12 --- CHANGELOG.md | 1 + pom.xml | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 751bc6c..87ccad9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Update jetty to 12.1.10 * Update transitive dependency on httpcore5 5.2.1 to 5.4.3 +* Update transitive dependency on micrometer-core 1.15.4 to 1.15.12 ## [4.0.6] - 2026-07-09 diff --git a/pom.xml b/pom.xml index ad2da4b..64229d1 100644 --- a/pom.xml +++ b/pom.xml @@ -212,6 +212,10 @@ org.apache.shiro shiro-web + + io.micrometer + micrometer-core + test @@ -264,6 +268,13 @@ ${jetty.version} test + + + + io.micrometer + micrometer-core + 1.15.12 + From d8f823141442feb6ea83dc5c043e1c1741029ade Mon Sep 17 00:00:00 2001 From: Kal Ahmed Date: Thu, 13 Aug 2026 10:55:38 +0100 Subject: [PATCH 2/2] Increase timeout to minimize test flakiness --- src/test/java/com/epimorphics/appbase/task/TestJsonActions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/epimorphics/appbase/task/TestJsonActions.java b/src/test/java/com/epimorphics/appbase/task/TestJsonActions.java index 1eab05c..c36166a 100644 --- a/src/test/java/com/epimorphics/appbase/task/TestJsonActions.java +++ b/src/test/java/com/epimorphics/appbase/task/TestJsonActions.java @@ -126,7 +126,7 @@ public void testErrorHandler() throws InterruptedException { assertFalse(pm.succeeded()); List messages = pm.getMessages(); int n = messages.size(); - Thread.sleep(100); + Thread.sleep(200); assertTrue( "Timeout detected".equals( messages.get(n-1).getMessage() ) || "Timeout detected".equals( messages.get(n-2).getMessage() ) );