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 4689729fdf365b0afaf1828b5749b50ebace6dbd Author: Oliver Lietz <[email protected]> AuthorDate: Thu Jun 23 14:40:00 2016 +0000 SLING-5809 Provide Sling's Launchpad Karaf Features as Options for Pax Exam add bundle org.apache.felix.inventory to webconsole git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1749903 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 5 ++++- .../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 1 + src/main/resources/templates/SlingOptions.txt | 5 ++++- src/main/resources/templates/SlingVersionResolver.txt | 1 + 4 files changed, 10 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 47f850c..600feb8 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -69,7 +69,10 @@ public class SlingOptions { } public static Option webconsole() { - return mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver); + 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) + ); } public static Option sling() { 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 7d862e3..5487117 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -40,6 +40,7 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5"); versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.6"); versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5"); + versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4"); versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.2"); versions.put("org.apache.felix:org.apache.felix.scr", "2.0.2"); versions.put("org.apache.felix:org.apache.felix.webconsole", "4.2.16"); diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt index 7bef485..8dcaf11 100644 --- a/src/main/resources/templates/SlingOptions.txt +++ b/src/main/resources/templates/SlingOptions.txt @@ -69,7 +69,10 @@ public class SlingOptions { } public static Option webconsole() { - return mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver); + 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) + ); } [# th:each="feature : ${features}"] public static Option [(${feature.javaName})]() { diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt index 8611187..232962e 100644 --- a/src/main/resources/templates/SlingVersionResolver.txt +++ b/src/main/resources/templates/SlingVersionResolver.txt @@ -40,6 +40,7 @@ public class SlingVersionResolver implements VersionResolver { versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5"); versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.6"); versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5"); + versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4"); versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.2"); versions.put("org.apache.felix:org.apache.felix.scr", "2.0.2"); versions.put("org.apache.felix:org.apache.felix.webconsole", "4.2.16");[# th:each="bundle : ${bundles}"] -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
