incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r814796 - in /sling/trunk/launchpad/base: pom.xml src/main/resources/sling.properties
Date Mon, 14 Sep 2009 19:33:30 GMT
Author: fmeschbe
Date: Mon Sep 14 19:33:30 2009
New Revision: 814796

URL: http://svn.apache.org/viewvc?rev=814796&view=rev
Log:
SLING-1108 Upgrade to Felix Framework 2.0.0 and OSGi Core/Compendium 1.4.0

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=814796&r1=814795&r2=814796&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Sep 14 19:33:30 2009
@@ -71,7 +71,7 @@
                         <Import-Package>!*</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Embed-Dependency>
-                            org.apache.felix.framework;inline=org/**,
+                            org.apache.felix.framework;inline=org/**|META-INF/**,
                             org.osgi.compendium;inline=org/osgi/service/http/**,
                             servlet-api;inline=javax/servlet/**,
                             servlet;inline=org/eclipse/**
@@ -168,19 +168,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>1.8.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.2.0</version>
+            <version>2.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>1.2.0</version>
+            <version>1.4.0</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=814796&r1=814795&r2=814796&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ sling/trunk/launchpad/base/src/main/resources/sling.properties Mon Sep 14 19:33:30 2009
@@ -187,15 +187,15 @@
 
 # Only provide the OSGi packages contained in the Felix framework itself
 sling.osgi-core-packages= \
- org.osgi.framework; version=1.4.0, \
- org.osgi.framework.hooks.service, \
- org.osgi.framework.launch, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0
+ org.osgi.framework; version=1.5, \
+ org.osgi.framework.hooks.service; version=1.0, \
+ org.osgi.framework.launch; 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 HTTP Service (embedded for the webapp) and the tracker
 # (from the felix framework)
 sling.osgi-compendium-services= \
- org.osgi.service.http;version="1.2", \
- org.osgi.util.tracker;version="1.3.3"
\ No newline at end of file
+ org.osgi.service.http;version="1.2.1", \
+ org.osgi.util.tracker;version="1.4"
\ No newline at end of file



Mime
View raw message