You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/09/07 11:20:44 UTC
[sling-org-apache-sling-testing-paxexam] 02/02: SLING-11520 Provision junit and hamcrest options by default
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 9451309852a723aecd3395b72f05f356e4d55baf
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Sep 7 13:15:02 2022 +0200
SLING-11520 Provision junit and hamcrest options by default
align JUnit, Hamcrest and Awaitility versions
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 2 +-
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 3 ++-
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 6 +++++-
src/main/resources/templates/SlingOptions.hbs | 2 +-
src/main/resources/templates/SlingVersionResolver.hbs | 3 ++-
5 files changed, 11 insertions(+), 5 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 4c19084..0b3645e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -43,7 +43,7 @@ public class SlingOptions {
public static ModifiableCompositeOption awaitility() {
return composite(
mavenBundle().groupId("org.awaitility").artifactId("awaitility").version(versionResolver),
- hamcrest()
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.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 7db25d7..8a07dd0 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -65,6 +65,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.groovy:groovy", "4.0.3");
versions.put("org.apache.groovy:groovy-json", "4.0.3");
versions.put("org.apache.groovy:groovy-xml", "4.0.3");
+ 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.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.12_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1");
@@ -73,7 +74,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-2.0.1", "2.0.1_1");
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.3", "2.3_3");
- versions.put("org.awaitility:awaitility", "4.2.0");
+ versions.put("org.awaitility:awaitility", "3.1.6");
versions.put("org.hamcrest:hamcrest", "2.2");
versions.put("org.ops4j.base:ops4j-base-io", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.1");
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 7d5356c..bf85fa5 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -39,8 +39,10 @@ import org.osgi.service.cm.ConfigurationAdmin;
import static org.apache.sling.testing.paxexam.SlingOptions.backing;
import static org.apache.sling.testing.paxexam.SlingOptions.paxTinybundles;
import static org.apache.sling.testing.paxexam.SlingOptions.spifly;
+import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.repository;
@@ -94,7 +96,9 @@ public abstract class TestSupport {
protected ModifiableCompositeOption baseConfiguration() {
return composite(
commonConfiguration(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject(),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").version(versionResolver),
+ junitBundles()
);
}
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 5533884..3ef012e 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -43,7 +43,7 @@ public class SlingOptions {
public static ModifiableCompositeOption awaitility() {
return composite(
mavenBundle().groupId("org.awaitility").artifactId("awaitility").version(versionResolver),
- hamcrest()
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").version(versionResolver)
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 5375b33..a8f89ca 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -65,6 +65,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.groovy:groovy", "4.0.3");
versions.put("org.apache.groovy:groovy-json", "4.0.3");
versions.put("org.apache.groovy:groovy-xml", "4.0.3");
+ 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.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.12_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1");
@@ -73,7 +74,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-2.0.1", "2.0.1_1");
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.3", "2.3_3");
- versions.put("org.awaitility:awaitility", "4.2.0");
+ versions.put("org.awaitility:awaitility", "3.1.6");
versions.put("org.hamcrest:hamcrest", "2.2");
versions.put("org.ops4j.base:ops4j-base-io", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.1");