svn commit: r1671003 - 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/

[olli]

Author: olli
Date: Fri Apr  3 06:50:45 2015
New Revision: 1671003

URL: http://svn.apache.org/r1671003
Log:
SLING-3027 SLING-3017 use latest releases (Sling Resource Resolver, Sling 
Discovery Impl)

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/SlingExtensionDiscoveryImplIT.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=1671003&r1=1671002&r2=1671003&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 Apr  3 06:50:45 2015
@@ -63,7 +63,7 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.3.6</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.4.0</bundle>
     <!-- org.apache.sling.resourceresolver requires jcr -->
-    
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.2.2</bundle>
+    
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.2.4</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>
     <!-- Apache Sling Commons -->
@@ -107,7 +107,10 @@
   <feature name="sling-extension-discovery-impl" version="${project.version}">
     <feature version="${project.version}">webconsole-sling</feature>
     <feature version="${project.version}">sling-extension-discovery</feature>
-    
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.0.12</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.1.0</bundle>
+    <!-- bundle dependencies -->
+    <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.1</bundle>
+    <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.4.1</bundle>
   </feature>
   <feature name="sling-extension-discovery-standalone" 
version="${project.version}">
     <feature version="${project.version}">sling-extension-discovery</feature>

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.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/SlingExtensionDiscoveryImplIT.java?rev=1671003&r1=1671002&r2=1671003&view=diff
==============================================================================
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java
 Fri Apr  3 06:50:45 2015
@@ -50,4 +50,18 @@ public class SlingExtensionDiscoveryImpl
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }
 
+    @Test
+    public void testOrgApacheHttpcomponentsHttpcore() {
+        final Bundle bundle = findBundle("org.apache.httpcomponents.httpcore");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
+    @Test
+    public void testOrgApacheHttpcomponentsHttpclient() {
+        final Bundle bundle = 
findBundle("org.apache.httpcomponents.httpclient");
+        assertNotNull(bundle);
+        assertEquals(Bundle.ACTIVE, bundle.getState());
+    }
+
 }