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 2020/11/25 20:59:46 UTC
[sling-org-apache-sling-testing-paxexam] 02/04: SLING-9939 Support
Server Mode
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 bd82d00f9bb6b179c3cdf204d7d71d6533a00040
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Nov 25 21:45:53 2020 +0100
SLING-9939 Support Server Mode
* Add base configuration for server mode
* Add missing dependencies for Tinybundles
---
.../org/apache/sling/testing/paxexam/SlingOptions.java | 4 ++++
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 3 +++
.../java/org/apache/sling/testing/paxexam/TestSupport.java | 14 ++++++++++++--
src/main/resources/templates/SlingOptions.hbs | 4 ++++
src/main/resources/templates/SlingVersionResolver.hbs | 3 +++
5 files changed, 26 insertions(+), 2 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 5d842c6..837f429 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -184,6 +184,10 @@ public class SlingOptions {
public static ModifiableCompositeOption paxTinybundles() {
return composite(
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-io").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-monitors").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-store").version(versionResolver),
mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").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 5f20a01..c6db89a 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -66,7 +66,10 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.codehaus.groovy:groovy-json", "3.0.1");
versions.put("org.codehaus.groovy:groovy-xml", "3.0.1");
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");
+ versions.put("org.ops4j.base:ops4j-base-monitors", "1.5.1");
+ versions.put("org.ops4j.base:ops4j-base-store", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");
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 034ac2c..9189a02 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -62,20 +62,30 @@ public abstract class TestSupport {
return Integer.parseInt(properties.get("org.osgi.service.http.port").toString());
}
- protected ModifiableCompositeOption baseConfiguration() {
+ private ModifiableCompositeOption configuration() {
return composite(
failOnUnresolvedBundles(),
keepCaches(),
localMavenRepo(),
repository("https://repository.apache.org/snapshots/").id("apache-snapshots").allowSnapshots(),
CoreOptions.workingDirectory(workingDirectory()),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject(),
paxTinybundles(),
backing(),
spifly()
);
}
+ protected ModifiableCompositeOption baseConfiguration() {
+ return composite(
+ configuration(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
+ );
+ }
+
+ protected ModifiableCompositeOption serverBaseConfiguration() {
+ return configuration();
+ }
+
public static int findFreePort() {
try (final ServerSocket serverSocket = new ServerSocket(0)) {
return serverSocket.getLocalPort();
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 3e5c9b9..b097757 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -184,6 +184,10 @@ public class SlingOptions {
public static ModifiableCompositeOption paxTinybundles() {
return composite(
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-io").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-monitors").version(versionResolver),
+ mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-store").version(versionResolver),
mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").version(versionResolver)
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index f0492e6..8eb8e72 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -66,7 +66,10 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.codehaus.groovy:groovy-json", "3.0.1");
versions.put("org.codehaus.groovy:groovy-xml", "3.0.1");
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");
+ versions.put("org.ops4j.base:ops4j-base-monitors", "1.5.1");
+ versions.put("org.ops4j.base:ops4j-base-store", "1.5.1");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.1");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");