svn commit: r1590371 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

[ol...@apache.org]

Author: olli
Date: Sun Apr 27 11:02:25 2014
New Revision: 1590371

URL: http://svn.apache.org/r1590371
Log:
SLING-3027 use latest releases (Commons Codec, Sling Commons Classloader, Sling Discovery Impl, Sling Event and Sling Resource Inventory), cleanup

Modified:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

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=1590371&r1=1590370&r2=1590371&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 Sun Apr 27 11:02:25 2014
@@ -13,7 +13,7 @@
   </feature>
   <!-- Apache Felix Webconsole -->
   <feature name="webconsole-sling" version="${project.version}">
-    <feature>commons-sling</feature>
+    <feature version="${project.version}">commons-sling</feature>
     <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole/4.2.2</bundle>
     <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/1.0.0</bundle>
     <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.0</bundle>
@@ -23,7 +23,7 @@
   </feature>
   <!-- Apache Commons -->
   <feature name="commons-sling" version="${project.version}">
-    <bundle dependency="true">mvn:commons-codec/commons-codec/1.6</bundle>
+    <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>
     <bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
     <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.1</bundle>
     <bundle dependency="true">mvn:commons-io/commons-io/1.4</bundle>
@@ -49,7 +49,7 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.0.0</bundle>
     <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.0</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.2</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) -->
@@ -97,7 +97,7 @@
   <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.4</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.0.8</bundle>
   </feature>
   <feature name="sling-extension-discovery-standalone" version="${project.version}">
     <feature version="${project.version}">sling-extension-discovery</feature>
@@ -107,7 +107,7 @@
     <!-- TODO java.lang.NoClassDefFoundError: org/apache/sling/commons/threads/ThreadPool -->
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-extension-discovery</feature>
-    <bundle>mvn:org.apache.sling/org.apache.sling.event/3.3.6</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.event/3.3.10</bundle>
   </feature>
   <feature name="sling-extension-explorer" version="${project.version}">
     <feature version="${project.version}">sling</feature>
@@ -117,24 +117,16 @@
     <feature version="${project.version}">sling</feature>
     <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/1.1.3-SNAPSHOT</bundle>
   </feature>
-  <!--
-  <feature name="sling-extension-groovy" version="${project.version}">
-    <feature version="${project.version}">sling</feature>
-    <bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/1.8.2</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.extensions.groovy/1.0.0-SNAPSHOT</bundle>
-  </feature>
-  -->
   <feature name="sling-extension-jmx-provider" version="${project.version}">
     <feature version="${project.version}">sling</feature>
     <bundle>mvn:org.apache.sling/org.apache.sling.jmx.provider/1.0.2</bundle>
   </feature>
   <feature name="sling-extension-resource-inventory" version="${project.version}">
     <feature version="${project.version}">sling</feature>
-    <bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.0</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.2</bundle>
     <!-- bundle dependencies -->
     <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.3</bundle>
   </feature>
-  <!-- TODO failes with NPE, should be moved to commons -->
   <feature name="sling-extension-threaddump" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2</bundle>
   </feature>