Return-Path: 
 <commits-return-6084-apmail-sling-commits-archive=sling.apache.org@sling.apache.org>
Delivered-To: apmail-sling-commits-archive@www.apache.org
Received: (qmail 46208 invoked from network); 14 Sep 2009 19:33:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 14 Sep 2009 19:33:52 -0000
Received: (qmail 32270 invoked by uid 500); 14 Sep 2009 19:33:52 -0000
Delivered-To: apmail-sling-commits-archive@sling.apache.org
Received: (qmail 32213 invoked by uid 500); 14 Sep 2009 19:33:52 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 32204 invoked by uid 99); 14 Sep 2009 19:33:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Sep 2009 19:33:52 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Sep 2009 19:33:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8947D23888DD; Mon, 14 Sep 2009 19:33:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r814796 - in /sling/trunk/launchpad/base: pom.xml
 src/main/resources/sling.properties
Date: Mon, 14 Sep 2009 19:33:30 -0000
To: commits@sling.apache.org
From: fmeschbe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090914193330.8947D23888DD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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