Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D6A389142 for ; Mon, 2 Apr 2012 19:21:44 +0000 (UTC) Received: (qmail 37342 invoked by uid 500); 2 Apr 2012 19:21:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 37283 invoked by uid 500); 2 Apr 2012 19:21:44 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 37274 invoked by uid 99); 2 Apr 2012 19:21:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 19:21:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 02 Apr 2012 19:21:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0D2DD23889E0; Mon, 2 Apr 2012 19:21:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1308483 - in /geronimo/server/branches/3.0-beta: framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties pom.xml Date: Mon, 02 Apr 2012 19:21:20 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120402192121.0D2DD23889E0@eris.apache.org> Author: gawor Date: Mon Apr 2 19:21:20 2012 New Revision: 1308483 URL: http://svn.apache.org/viewvc?rev=1308483&view=rev Log: GERONIMO-6312: Update xbean bundleutils to take advantage of OSGi 4.3 Modified: geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties geronimo/server/branches/3.0-beta/pom.xml Modified: geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1308483&r1=1308482&r2=1308483&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original) +++ geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Mon Apr 2 19:21:20 2012 @@ -88,7 +88,7 @@ commons-lang/commons-lang/2.6/commons-la commons-cli/commons-cli/1.2/commons-cli-1.2.jar=40 org/apache/geronimo/bundles/sxc-jaxb/${sxcVersion}/sxc-jaxb-${sxcVersion}.jar=40 org/apache/geronimo/bundles/sxc-runtime/${sxcVersion}/sxc-runtime-${sxcVersion}.jar=40 -org/apache/xbean/xbean-bundleutils/${xbeanVersion}/xbean-bundleutils-${xbeanVersion}.jar=40 +org/apache/xbean/xbean-bundleutils/${xbean.bundleutils.version}/xbean-bundleutils-${xbean.bundleutils.version}.jar=40 org/apache/xbean/xbean-finder/${xbeanVersion}/xbean-finder-${xbeanVersion}.jar=40 org/apache/xbean/xbean-reflect/${xbeanVersion}/xbean-reflect-${xbeanVersion}.jar=40 org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=40 Modified: geronimo/server/branches/3.0-beta/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/pom.xml?rev=1308483&r1=1308482&r2=1308483&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/pom.xml (original) +++ geronimo/server/branches/3.0-beta/pom.xml Mon Apr 2 19:21:20 2012 @@ -157,6 +157,8 @@ 0.3 0.3 0.3 + + 3.10-SNAPSHOT @@ -497,7 +499,7 @@ org.apache.xbean xbean-bundleutils - ${xbeanVersion} + ${xbean.bundleutils.version} org.slf4j