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
The following commit(s) were added to refs/heads/master by this push:
new 03555cc SLING-8590 Provide REST Assured Option
03555cc is described below
commit 03555cc4dd3e3ec5245fa898656aba007300faa3
Author: Oliver Lietz <[email protected]>
AuthorDate: Sat Aug 17 18:11:44 2019 +0200
SLING-8590 Provide REST Assured Option
fix dependencies (Java 8)
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 5 ++++-
src/main/resources/templates/SlingOptions.hbs | 5 ++++-
2 files changed, 8 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 a72c4d6..c7f5d6a 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -178,7 +178,6 @@ public class SlingOptions {
public static ModifiableCompositeOption restassured() {
return composite(
- backing(),
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),
@@ -187,7 +186,11 @@ public class SlingOptions {
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy").version(versionResolver),
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-json").version(versionResolver),
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-xml").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.tagsoup").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.2").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").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.hamcrest").artifactId("hamcrest").version(versionResolver)
diff --git a/src/main/resources/templates/SlingOptions.hbs
b/src/main/resources/templates/SlingOptions.hbs
index e27a730..23d3c13 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -176,7 +176,6 @@ public class SlingOptions {
public static ModifiableCompositeOption restassured() {
return composite(
- backing(),
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),
@@ -185,7 +184,11 @@ public class SlingOptions {
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy").version(versionResolver),
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-json").version(versionResolver),
mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-xml").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jaxb-impl").version(versionResolver),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.tagsoup").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-1.1").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxb-api-2.2").version(versionResolver),
+
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.stax-api-1.2").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.hamcrest").artifactId("hamcrest").version(versionResolver)
