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/04/03 05:37:51 UTC

[sling-org-apache-sling-testing-paxexam] 02/02: add missing OSGi Configuration Admin required by HttpComponents to restassured

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 7d02fb72c6bd009f31c28c2df63e2dc11b3b79cd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 3 07:37:19 2020 +0200

    add missing OSGi Configuration Admin required by HttpComponents to restassured
---
 src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 1 +
 src/main/resources/templates/SlingOptions.hbs                    | 1 +
 2 files changed, 2 insertions(+)

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 a0c136b..616abab 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -178,6 +178,7 @@ public class SlingOptions {
 
     public static ModifiableCompositeOption restassured() {
         return composite(
+            config(),
             mavenBundle().groupId("io.rest-assured").artifactId("rest-assured").version(versionResolver),
             mavenBundle().groupId("io.rest-assured").artifactId("rest-assured-common").version(versionResolver),
             mavenBundle().groupId("io.rest-assured").artifactId("json-path").version(versionResolver),
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index fb1d56f..68d27f4 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -178,6 +178,7 @@ public class SlingOptions {
 
     public static ModifiableCompositeOption restassured() {
         return composite(
+            config(),
             mavenBundle().groupId("io.rest-assured").artifactId("rest-assured").version(versionResolver),
             mavenBundle().groupId("io.rest-assured").artifactId("rest-assured-common").version(versionResolver),
             mavenBundle().groupId("io.rest-assured").artifactId("json-path").version(versionResolver),