This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 3e2eeece44 build(deps): bump org.awaitility:awaitility from 3.1.6 to
4.3.0 (#2814)
3e2eeece44 is described below
commit 3e2eeece44d573da48a758fb9e4c361667eaa2f1
Author: Holger Friedrich <[email protected]>
AuthorDate: Tue Aug 25 16:27:21 2026 +0200
build(deps): bump org.awaitility:awaitility from 3.1.6 to 4.3.0 (#2814)
* Upgrade awaitility to 4.3.0
* Use hamcrest 2.2 with awaitility
Signed-off-by: Holger Friedrich <[email protected]>
---
examples/karaf-itest-example/pom.xml | 7 ++++---
.../src/main/java/org/apache/karaf/itests/KarafTestSupport.java | 4 ++--
itests/test/pom.xml | 7 ++++---
pom.xml | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/examples/karaf-itest-example/pom.xml
b/examples/karaf-itest-example/pom.xml
index 6e0b969724..0172a38fd9 100644
--- a/examples/karaf-itest-example/pom.xml
+++ b/examples/karaf-itest-example/pom.xml
@@ -100,10 +100,11 @@
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
+ <!-- awaitility 4.3 requires org.hamcrest;version="[2.1,3)" -->
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
- <version>1.3_1</version>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>2.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git
a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
index 3a9876d12b..0f6971c231 100644
--- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -247,7 +247,7 @@ public class KarafTestSupport {
CoreOptions.systemTimeout(3600000),
RBCRemoteTargetOptions.waitForRBCFor(3600000),
CoreOptions.mavenBundle().groupId("org.awaitility").artifactId("awaitility").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.hamcrest").artifactId("hamcrest").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.karaf.itests").artifactId("common").versionAsInProject(),
CoreOptions.mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
//replaceConfigurationFile("etc/host.key",
getConfigFile("/etc/host.key")),
@@ -296,7 +296,7 @@ public class KarafTestSupport {
CoreOptions.systemTimeout(3600000),
RBCRemoteTargetOptions.waitForRBCFor(3600000),
CoreOptions.mavenBundle().groupId("org.awaitility").artifactId("awaitility").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.hamcrest").artifactId("hamcrest").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.karaf.itests").artifactId("common").versionAsInProject(),
//replaceConfigurationFile("etc/host.key",
getConfigFile("/etc/host.key")),
KarafDistributionOption.replaceConfigurationFile("etc/users.properties",
getConfigFile("/etc/users.properties")),
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index b6cf47da1a..5df8533431 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -135,10 +135,11 @@
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
+ <!-- awaitility 4.3 requires org.hamcrest;version="[2.1,3)" -->
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
- <version>1.3_1</version>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>2.2</version>
<scope>runtime</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 11e2f2df04..8e562ce69b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
<aspectj.version>1.9.21.1</aspectj.version>
<asm.version>9.10.1</asm.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
- <awaitility.version>3.1.6</awaitility.version>
+ <awaitility.version>4.3.0</awaitility.version>
<bouncycastle.version>1.85</bouncycastle.version>
<camel.version>4.18.2</camel.version>
<cglib.version>3.2.9</cglib.version>
