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/04/22 14:13:43 UTC
svn commit: r1675341 - in /sling/trunk/contrib/launchpad/karaf:
org.apache.sling.launchpad.karaf-features/src/main/feature/
org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/
Author: olli
Date: Wed Apr 22 12:13:43 2015
New Revision: 1675341
URL: http://svn.apache.org/r1675341
Log:
SLING-3027 fix bundle state in derby test and use lastest release (derby)
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1675341&r1=1675340&r2=1675341&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Wed Apr 22 12:13:43 2015
@@ -193,7 +193,7 @@
<feature version="${project.version}">sling-extension-adapter</feature>
<feature version="${project.version}">sling-extension-bundleresource</feature>
<!-- bundle dependencies -->
- <bundle dependency="true">mvn:org.apache.derby/derby/10.10.2.0</bundle>
+ <bundle dependency="true">mvn:org.apache.derby/derby/10.11.1.1</bundle>
</feature>
<feature name="sling-launchpad-oak" version="${project.version}"><!-- hidden="true" -->
<!-- Sling with Oak Repository and Felix Web Console -->
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java?rev=1675341&r1=1675340&r2=1675341&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java Wed Apr 22 12:13:43 2015
@@ -56,7 +56,7 @@ public class SlingLaunchpadJackrabbitDer
public void testDerby() {
final Bundle bundle = findBundle("derby");
assertNotNull(bundle);
- assertEquals(Bundle.RESOLVED, bundle.getState());
+ assertEquals(Bundle.ACTIVE, bundle.getState());
}
@Test