You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/07/29 22:37:25 UTC
svn commit: r1693342 - in /sling/trunk/bundles/jcr/contentloader: pom.xml
src/test/java/org/apache/sling/jcr/contentloader/it/P.java
Author: olli
Date: Wed Jul 29 20:37:24 2015
New Revision: 1693342
URL: http://svn.apache.org/r1693342
Log:
SLING-4917 BasicInitialContentIT fails for the org.apache.sling.jcr.contentloader module
* add missing dependency to POM and use versionAsInProject()
Modified:
sling/trunk/bundles/jcr/contentloader/pom.xml
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java
Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1693342&r1=1693341&r2=1693342&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Wed Jul 29 20:37:24 2015
@@ -331,5 +331,11 @@
<version>2.0.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.karaf</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java?rev=1693342&r1=1693341&r2=1693342&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java Wed Jul 29 20:37:24 2015
@@ -50,9 +50,8 @@ public class P {
wrappedBundle(mavenBundle("org.apache.sling", "org.apache.sling.commons.testing").versionAsInProject()),
wrappedBundle(mavenBundle("org.ops4j.pax.tinybundles", "tinybundles").versionAsInProject()),
mavenBundle("biz.aQute.bnd", "bndlib").versionAsInProject(),
-
- // TODO the Sling Settings service is not available without this (missing launchpad startup event?)
- mavenBundle("org.apache.sling", "org.apache.sling.launchpad.karaf", "0.1.1-SNAPSHOT")
+ // TODO the Sling Settings service is not available without this (missing launchpad startup event?)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.karaf").versionAsInProject()
).getOptions();
} finally {
SlingPaxOptions.setIgnoredBundles();