This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-capabilities-jcr.git
The following commit(s) were added to refs/heads/master by this push:
new 5bfaa90 Implement JcrCapabilitiesBundleIT
5bfaa90 is described below
commit 5bfaa903ea6ff3ceccd4e947afebff8558af1998
Author: Bertrand Delacretaz <[email protected]>
AuthorDate: Tue Oct 30 16:31:50 2018 +0100
Implement JcrCapabilitiesBundleIT
---
.../sling/capabilities/it/JcrCapabilitiesBundleIT.java | 2 --
.../sling/capabilities/it/JcrCapabilitiesTestSupport.java | 15 +++++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesBundleIT.java
b/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesBundleIT.java
index f7906d2..ac22b5a 100644
---
a/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesBundleIT.java
+++
b/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesBundleIT.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -31,7 +30,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-@Ignore("Need to fix unresolved bundles")
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class JcrCapabilitiesBundleIT extends JcrCapabilitiesTestSupport {
diff --git
a/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
b/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
index 56f47c1..a816e31 100644
---
a/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
+++
b/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
@@ -38,15 +38,22 @@ public abstract class JcrCapabilitiesTestSupport extends
TestSupport {
return new Option[]{
baseConfiguration(),
+ // Use older versions to stay compatible with older versions of
Sling - no need for bleeding edge stuff
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version("1.1.2"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version("2.0.2"),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.api").version("2.11.0"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.jcr-wrapper").version("2.0.0"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.api").version("2.3.0"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.serviceusermapper").version("1.2.2"),
- // TODO update version once we have a release
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.capabilities").version("0.0.1-SNAPSHOT"),
-
- // This bundle
+ // Dependencies of the above bundles
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version("2.0.16"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version("2.4.0"),
+
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.eventadmin").version("1.4.4"),
+
+ // This bundle and the core capabilities bundle
testBundle("bundle.filename"),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.capabilities").versionAsInProject(),
// Test stuff
junitBundles(),
