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-testing-paxexam.git
commit 81e30b1586d539daec363c4bd285d30370683829 Author: Oliver Lietz <[email protected]> AuthorDate: Sun Jul 21 20:25:32 2019 +0200 SLING-8589 Provide Awaitility Option Use Awaitility 4.0.0-rc1 and Hamcrest 2.1 --- src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 2 +- .../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 4 ++-- src/main/resources/templates/SlingOptions.hbs | 2 +- src/main/resources/templates/SlingVersionResolver.hbs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java index e850700..94ff421 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -40,7 +40,7 @@ public class SlingOptions { public static ModifiableCompositeOption awaitility() { return composite( mavenBundle().groupId("org.awaitility").artifactId("awaitility").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").version(versionResolver) + mavenBundle().groupId("org.hamcrest").artifactId("hamcrest").version(versionResolver) ); } diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java index eaeadac..a5092db 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -38,7 +38,6 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2", "2.9.0"); - versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.hamcrest", "1.3_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1"); versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0"); versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0"); @@ -57,7 +56,8 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2"); versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16"); versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12"); - versions.put("org.awaitility:awaitility", "3.1.6"); + versions.put("org.awaitility:awaitility", "4.0.0-rc1"); + versions.put("org.hamcrest:hamcrest", "2.1"); versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0"); versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0"); versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3"); diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs index fea1956..7537697 100644 --- a/src/main/resources/templates/SlingOptions.hbs +++ b/src/main/resources/templates/SlingOptions.hbs @@ -40,7 +40,7 @@ public class SlingOptions { public static ModifiableCompositeOption awaitility() { return composite( mavenBundle().groupId("org.awaitility").artifactId("awaitility").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").version(versionResolver) + mavenBundle().groupId("org.hamcrest").artifactId("hamcrest").version(versionResolver) ); } diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs index 030be6a..d2dd5fa 100644 --- a/src/main/resources/templates/SlingVersionResolver.hbs +++ b/src/main/resources/templates/SlingVersionResolver.hbs @@ -38,7 +38,6 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1"); versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2", "2.9.0"); - versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.hamcrest", "1.3_1"); versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1"); versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0"); versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0"); @@ -57,7 +56,8 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2"); versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16"); versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12"); - versions.put("org.awaitility:awaitility", "3.1.6"); + versions.put("org.awaitility:awaitility", "4.0.0-rc1"); + versions.put("org.hamcrest:hamcrest", "2.1"); versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0"); versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0"); versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
