diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index b7fd306ae0e..83085630f54 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -100,10 +100,11 @@ org.awaitility awaitility + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.hamcrest - 1.3_1 + org.hamcrest + hamcrest + 2.2 runtime 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 3a9876d12b0..0f6971c2315 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 Option[] config() { 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 Option[] config() { 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 6a079fcb294..83e6c2e92cf 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -135,10 +135,11 @@ org.awaitility awaitility + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.hamcrest - 1.3_1 + org.hamcrest + hamcrest + 2.2 runtime diff --git a/pom.xml b/pom.xml index eb7c02babed..31d59e58663 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ 1.9.21.1 9.10.1 2.1.1 - 3.1.6 + 4.3.0 1.85 4.18.2 3.2.9