Author: olli
Date: Thu Jun 23 14:40:00 2016
New Revision: 1749903
URL: http://svn.apache.org/viewvc?rev=1749903&view=rev
Log:
SLING-5809 Provide Sling's Launchpad Karaf Features as Options for Pax Exam
add bundle org.apache.felix.inventory to webconsole
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1749903&r1=1749902&r2=1749903&view=diff
==============================================================================
---
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
(original)
+++
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
Thu Jun 23 14:40:00 2016
@@ -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() {
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1749903&r1=1749902&r2=1749903&view=diff
==============================================================================
---
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
(original)
+++
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
Thu Jun 23 14:40:00 2016
@@ -40,6 +40,7 @@ public class SlingVersionResolver implem
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");
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1749903&r1=1749902&r2=1749903&view=diff
==============================================================================
---
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
(original)
+++
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
Thu Jun 23 14:40:00 2016
@@ -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})]() {
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt?rev=1749903&r1=1749902&r2=1749903&view=diff
==============================================================================
---
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
(original)
+++
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
Thu Jun 23 14:40:00 2016
@@ -40,6 +40,7 @@ public class SlingVersionResolver implem
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}"]
