From eaf7e0826fdefaaeda23111fb93d69c766668d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Tue, 4 Jun 2019 09:11:36 +0200 Subject: [PATCH 1/2] [KARAF-6300] Upgrade to Pax Logging 1.10.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a0d4f80ccb..c9a280f096d 100644 --- a/pom.xml +++ b/pom.xml @@ -282,7 +282,7 @@ 1.1.1 4.13.1 - 1.10.1 + 1.10.2 1.5.0 1.8.3 2.6.1 From ca3fdc0fc54b890e3fcbc83620a968845a8f489c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Wed, 5 Jun 2019 18:27:17 +0200 Subject: [PATCH 2/2] Fix WebTest itest --- .../test/src/test/java/org/apache/karaf/itests/WebTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java index ce1bb29d988..128b0130526 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java @@ -83,9 +83,13 @@ public void installUninstallCommands() throws Exception { System.out.println(buffer.toString()); assertContains("Hello World!", buffer.toString()); - System.out.println(executeCommand("web:uninstall 126")); + System.out.println(executeCommand("web:uninstall 125")); listOutput = executeCommand("web:list"); System.out.println(listOutput); + while (listOutput.contains("/test")) { + Thread.sleep(500); + listOutput = executeCommand("web:list"); + } assertContainsNot("/test", listOutput); }