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/12/04 19:18:55 UTC
svn commit: r1718004 - 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: Fri Dec 4 18:18:55 2015
New Revision: 1718004
URL: http://svn.apache.org/viewvc?rev=1718004&view=rev
Log:
SLING-3027 Improve Launchpad Karaf features
* use org.apache.sling.settings snapshot
* remove obsolete bundles org.apache.sling.launchpad.api and org.apache.sling.launchpad.karaf
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/SlingIT.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=1718004&r1=1718003&r2=1718004&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 Fri Dec 4 18:18:55 2015
@@ -26,7 +26,7 @@
<!-- org.apache.sling.resourceresolver requires jcr -->
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.2.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.2.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.7-SNAPSHOT</bundle>
<!-- Apache Sling Commons -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.compiler/2.2.0</bundle>
@@ -36,9 +36,6 @@
<!-- (not using org.apache.sling.commons.logservice) -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.3.0</bundle>
- <!-- Apache Sling Launchpad -->
- <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.api/1.2.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}</bundle>
<!-- dependencies -->
<feature>config</feature>
<feature>eventadmin</feature>
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.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/SlingIT.java?rev=1718004&r1=1718003&r2=1718004&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java Fri Dec 4 18:18:55 2015
@@ -137,20 +137,6 @@ public class SlingIT extends KarafTestSu
}
@Test
- public void testOrgApacheSlingLaunchpadApi() {
- final Bundle bundle = findBundle("org.apache.sling.launchpad.api");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheSlingLaunchpadKaraf() {
- final Bundle bundle = findBundle("org.apache.sling.launchpad.karaf");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
@Ignore
public void testJavaxJcr() {
final Bundle bundle = findBundle("javax.jcr");