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/07/22 16:17:57 UTC
svn commit: r1692281 -
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Author: olli
Date: Wed Jul 22 14:17:56 2015
New Revision: 1692281
URL: http://svn.apache.org/r1692281
Log:
SLING-3027 use latest releases (Sling Resource Resolver, Sling Resource Merger)
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=1692281&r1=1692280&r2=1692281&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 Jul 22 14:17:56 2015
@@ -24,7 +24,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.3.10</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.4.2</bundle>
<!-- org.apache.sling.resourceresolver requires jcr -->
- <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.2.4</bundle>
+ <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>
<!-- Apache Sling Commons -->
@@ -431,7 +431,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-extension-resourcemerger" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.resourcemerger/1.2.8</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.resourcemerger/1.2.10</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>