This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 4c43308d6167700f60d71d8b644ef02bcab5cf30 Author: Oliver Lietz <[email protected]> AuthorDate: Wed Jul 27 20:20:29 2016 +0000 SLING-5911 Make non-generated Options self-contained git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754340 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/testing/paxexam/SlingOptions.java | 25 ++++++++++++++++------ src/main/resources/templates/SlingOptions.txt | 25 ++++++++++++++++------ 2 files changed, 38 insertions(+), 12 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 863857e..07b6bbe 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -37,18 +37,25 @@ public class SlingOptions { } public static Option eventadmin() { - return mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.eventadmin").version(versionResolver); + return composite( + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.eventadmin").version(versionResolver), + config() + ); } public static Option http() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver), + config() ); } public static Option httpWhiteboard() { - return mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.whiteboard").version(versionResolver); + return composite( + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.whiteboard").version(versionResolver), + http() + ); } public static Option management() { @@ -56,21 +63,27 @@ public class SlingOptions { mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver), mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.api").version(versionResolver), mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.core").version(versionResolver), - mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.whiteboard").version(versionResolver) + mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.whiteboard").version(versionResolver), + config() ); } public static Option scr() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.metatype").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version(versionResolver), + config() ); } public static Option webconsole() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver), + mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver), + mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver), + mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver), + http() ); } diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt index 4e129de..3d87470 100644 --- a/src/main/resources/templates/SlingOptions.txt +++ b/src/main/resources/templates/SlingOptions.txt @@ -38,18 +38,25 @@ public class SlingOptions { } public static Option eventadmin() { - return mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.eventadmin").version(versionResolver); + return composite( + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.eventadmin").version(versionResolver), + config() + ); } public static Option http() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver), + config() ); } public static Option httpWhiteboard() { - return mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.whiteboard").version(versionResolver); + return composite( + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.whiteboard").version(versionResolver), + http() + ); } public static Option management() { @@ -57,21 +64,27 @@ public class SlingOptions { mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver), mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.api").version(versionResolver), mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.core").version(versionResolver), - mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.whiteboard").version(versionResolver) + mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.whiteboard").version(versionResolver), + config() ); } public static Option scr() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.metatype").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version(versionResolver), + config() ); } public static Option webconsole() { return composite( mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver), + mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver), + mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver), + mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver), + http() ); } [# th:each="feature : ${features}"] -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
