incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1361580 - in /sling/trunk/launchpad/base: pom.xml src/main/resources/sling.properties
Date Sat, 14 Jul 2012 19:55:02 GMT
Author: fmeschbe
Date: Sat Jul 14 19:55:01 2012
New Revision: 1361580

URL: http://svn.apache.org/viewvc?rev=1361580&view=rev
Log:
SLING-2369 update to Felix Framework 4.0.3 and adapt framework export packages and versions
(corresponding to OSGi Core R 4.3)

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=1361580&r1=1361579&r2=1361580&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Sat Jul 14 19:55:01 2012
@@ -225,7 +225,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.3</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=1361580&r1=1361579&r2=1361580&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ sling/trunk/launchpad/base/src/main/resources/sling.properties Sat Jul 14 19:55:01 2012
@@ -205,13 +205,18 @@ sling.bootdelegation.ibm = com.ibm.xml.*
 
 # Only provide the OSGi packages contained in the Felix framework itself
 sling.osgi-core-packages= \
- org.osgi.framework; version=1.5, \
- org.osgi.framework.hooks.service; version=1.0, \
+ org.osgi.framework; version=1.6, \
+ org.osgi.framework.hooks.bundle; version=1.0, \
+ org.osgi.framework.hooks.resolver; version=1.0, \
+ org.osgi.framework.hooks.service; version=1.1, \
+ org.osgi.framework.hooks.weaving; version=1.0, \
  org.osgi.framework.launch; version=1.0, \
+ org.osgi.framework.startlevel; version=1.0, \
+ org.osgi.framework.wiring; version=1.0, \
  org.osgi.service.packageadmin; version=1.2, \
  org.osgi.service.startlevel; version=1.1, \
  org.osgi.service.url; version=1.0
 
 # Only provide the tracker (from the felix framework) 
 sling.osgi-compendium-services= \
- org.osgi.util.tracker;version="1.4"
\ No newline at end of file
+ org.osgi.util.tracker;version="1.5"
\ No newline at end of file



Mime
View raw message