svn commit: r1308483 - in /geronimo/server/branches/3.0-beta: framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties pom.xml

[ga...@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 @@
         <aries.util.version>0.3</aries.util.version>
         <aries.jndi.version>0.3</aries.jndi.version>
         <aries.proxy.version>0.3</aries.proxy.version>
+
+        <xbean.bundleutils.version>3.10-SNAPSHOT</xbean.bundleutils.version>
     </properties>
 
     <dependencyManagement>
@@ -497,7 +499,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-bundleutils</artifactId>
-                <version>${xbeanVersion}</version>
+                <version>${xbean.bundleutils.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>