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:49 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated
(903526b -> 7d02fb7)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git.
from 903526b SLING-9128 Update Pax Exam to 4.13.3
new 84b36e5 SLING-9318 Provide HttpComponents Client Option
new 7d02fb7 add missing OSGi Configuration Admin required by HttpComponents to restassured
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/sling/testing/paxexam/SlingOptions.java | 25 +++++++++++++---------
src/main/resources/templates/SlingOptions.hbs | 1 +
2 files changed, 16 insertions(+), 10 deletions(-)
[sling-org-apache-sling-testing-paxexam] 02/02: add missing OSGi
Configuration Admin required by HttpComponents to restassured
Posted by ol...@apache.org.
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),
[sling-org-apache-sling-testing-paxexam] 01/02: SLING-9318 Provide
HttpComponents Client Option
Posted by ol...@apache.org.
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 84b36e5f58ee82bf04ef98b8b1ad89b6228ca895
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Apr 2 09:44:49 2020 +0200
SLING-9318 Provide HttpComponents Client Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 24 +++++++++++++---------
1 file changed, 14 insertions(+), 10 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 5c01a8a..a0c136b 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -412,12 +412,11 @@ public class SlingOptions {
webconsole(),
slingDiscovery(),
slingHealthcheck(),
+ httpcomponentsClient(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.base").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.commons").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.oak").version(versionResolver),
mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver),
factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
.put("scripts", new String[]{"create service user sling-discovery\n\n create path (sling:Folder) /var/discovery\n\n create path (sling:Folder) /var/discovery/oak\n\n set ACL for sling-discovery\n\n allow jcr:read on /var/discovery\n\n allow rep:write on /var/discovery\n\n end"})
.asOption(),
@@ -441,10 +440,9 @@ public class SlingOptions {
slingEvent(),
slingHealthcheck(),
jackrabbitVault(),
+ httpcomponentsClient(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver)
);
}
@@ -625,9 +623,8 @@ public class SlingOptions {
public static ModifiableCompositeOption slingXss() {
return composite(
sling(),
+ httpcomponentsClient(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.xss").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver),
factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
.put("scripts", new String[]{"create service user sling-xss\n\n create path (sling:Folder) /apps/sling/xss\n\n create path (sling:Folder) /libs/sling/xss\n\n set ACL for sling-xss\n\n allow jcr:read on /apps/sling/xss\n\n allow jcr:read on /libs/sling/xss\n\n end"})
.asOption(),
@@ -967,6 +964,7 @@ public class SlingOptions {
public static ModifiableCompositeOption jackrabbit() {
return composite(
+ httpcomponentsClient(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-data").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-commons").version(versionResolver),
@@ -985,9 +983,7 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-el_2.2_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-interceptor_1.1_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jcdi_1.0_spec").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver)
+ mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver)
);
}
@@ -1056,6 +1052,14 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption httpcomponentsClient() {
+ return composite(
+ config(),
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption thymeleaf() {
return composite(
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.thymeleaf").version(versionResolver),