Author: olli Date: Wed May 28 09:32:47 2014 New Revision: 1597951 URL: http://svn.apache.org/r1597951 Log: SLING-3027 SLING-3017 update features and test
- uses latest releases (Derby, Sling JCR ContentLoader, Sling Scripting JSP) - add Sling Commons Compiler, Concurrent and Commons Pool 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/SlingJcrJackrabbitIT.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=1597951&r1=1597950&r2=1597951&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 May 28 09:32:47 2014 @@ -35,7 +35,7 @@ </feature> <!-- Apache Derby --> <feature name="derby-sling" version="${project.version}"> - <bundle dependency="true">mvn:org.apache.derby/derby/10.5.3.0_1</bundle> + <bundle dependency="true">mvn:org.apache.derby/derby/10.10.2.0</bundle> </feature> <!-- Apache Sling --> <feature name="sling" version="${project.version}"> @@ -50,6 +50,7 @@ <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.0</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> <!-- org.apache.sling.commons.json requires jcr --> <bundle>mvn:org.apache.sling/org.apache.sling.commons.json/2.0.6</bundle> <!-- (not using org.apache.sling.commons.log) --> @@ -183,7 +184,7 @@ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.2.0</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.2.2</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.0</bundle> - <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.7-SNAPSHOT</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.8</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.2.0</bundle> <!-- (not using org.apache.sling.jcr.jcr-wrapper) --> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.ocm/2.0.4-incubator</bundle> @@ -201,6 +202,9 @@ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.3-SNAPSHOT</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0</bundle> + <!-- bundle dependencies --> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1</bundle> + <bundle dependency="true">mvn:commons-pool/commons-pool/1.6</bundle> </feature> <!-- Apache Sling Scripting --> <feature name="sling-scripting" version="${project.version}"> @@ -217,7 +221,7 @@ </feature> <feature name="sling-scripting-jsp" version="${project.version}"> <feature version="${project.version}">sling-scripting</feature> - <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.0.28</bundle> + <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.1.0</bundle> <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.0</bundle> </feature> <!-- Apache Sling Servlets --> Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.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/SlingJcrJackrabbitIT.java?rev=1597951&r1=1597950&r2=1597951&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java Wed May 28 09:32:47 2014 @@ -65,4 +65,18 @@ public class SlingJcrJackrabbitIT extend assertEquals(Bundle.ACTIVE, bundle.getState()); } + @Test + public void testOrgApacheServicemixBundlesConcurrent() { + final Bundle bundle = findBundle("org.apache.servicemix.bundles.concurrent"); + assertNotNull(bundle); + assertEquals(Bundle.ACTIVE, bundle.getState()); + } + + @Test + public void testOrgApacheCommonsPool() { + final Bundle bundle = findBundle("org.apache.commons.pool"); + assertNotNull(bundle); + assertEquals(Bundle.ACTIVE, bundle.getState()); + } + }