sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1687130 - in /sling/trunk/launchpad/base: pom.xml src/main/resources/sling.properties
Date Tue, 23 Jun 2015 20:42:06 GMT
Author: cziegeler
Date: Tue Jun 23 20:42:05 2015
New Revision: 1687130

URL: http://svn.apache.org/r1687130
Log:
SLING-4830 : Update to latest Felix Framework 5.0.1

Modified:
    sling/trunk/launchpad/base/pom.xml
    sling/trunk/launchpad/base/src/main/resources/sling.properties

Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1687130&r1=1687129&r2=1687130&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Tue Jun 23 20:42:05 2015
@@ -32,7 +32,7 @@
        This version is a concatenation of the framework version and a version for the launchpad
base itself.
        For a release only the qualifier (launchpad base version) is increased.
      -->
-    <version>5.0.0-2.6.1-SNAPSHOT</version>
+    <version>5.0.1-2.6.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Sling Launchpad Base</name>
@@ -258,7 +258,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>5.0.0</version>
+            <version>5.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/launchpad/base/src/main/resources/sling.properties
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=1687130&r1=1687129&r2=1687130&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ sling/trunk/launchpad/base/src/main/resources/sling.properties Tue Jun 23 20:42:05 2015
@@ -225,10 +225,11 @@ sling.osgi-core-packages= \
  org.osgi.resource; version=1.0.0, \
  org.osgi.resource.dto; version=1.0.0, \
  org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.resolver; version=1.0.0, \
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0
 
-
-# Only provide the tracker (from the Apache felix framework) 
+# For compatibility we add util.tracker here, although starting
+# with R5 it's officially part of the framework.
 sling.osgi-compendium-services= \
- org.osgi.util.tracker;version="1.5.1"
\ No newline at end of file
+ org.osgi.util.tracker; version=1.5.1
\ No newline at end of file



Mime
View raw message