This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-presence.git
commit d278464bbf64779750cf2d4df85ad3f17895be91 Author: Oliver Lietz <[email protected]> AuthorDate: Mon Aug 29 21:33:42 2022 +0200 SLING-11473 Update Testing PaxExam to 4.0.0 switch back to Hamcrest 1.3 (SLING-11520) --- pom.xml | 6 +++--- .../sling/resource/presence/ResourcePresenterTestSupport.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9a56f57..ba1eb7b 100644 --- a/pom.xml +++ b/pom.xml @@ -222,10 +222,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.hamcrest</artifactId> + <version>1.3_1</version> <scope>test</scope> - <version>2.2</version> </dependency> <dependency> <groupId>org.awaitility</groupId> diff --git a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java index f1a9ad8..fb26c77 100644 --- a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java +++ b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java @@ -24,6 +24,7 @@ import org.ops4j.pax.exam.options.ModifiableCompositeOption; import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar; import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration; public abstract class ResourcePresenterTestSupport extends TestSupport { @@ -38,7 +39,9 @@ public abstract class ResourcePresenterTestSupport extends TestSupport { testBundle("bundle.filename"), factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") .put("user.mapping", new String[]{"org.apache.sling.resource.presence=[sling-readall]"}) - .asOption() + .asOption(), + // testing + mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject() ); }
