commit c7f649d41b858a6bfb3b7d28627459234e3e12e9
author Guillaume Nodet <gnodet@apache.org> Sat Feb 20 20:23:14 2010 +0000
committer Guillaume Nodet <gnodet@apache.org> Sat Feb 20 20:23:14 2010 +0000
tree 57b2bea29683f6890c10c56a0da61a812912df0b
parent cf2b677c87a6b415ff2350f85280a22c9c42e5e7

FELIX-1990: Use aries blueprint / jmx

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@912215 13f79535-47bb-0310-9956-ffa450edef68

karaf/pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 8984831..d7735fa 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -83,7 +83,8 @@
         <felix.prefs.version>1.0.4</felix.prefs.version>
         <felix.webconsole.version>2.0.6</felix.webconsole.version>
         <felix.metatype.version>1.0.2</felix.metatype.version>
-        <geronimo.blueprint.version>1.0.0</geronimo.blueprint.version>
+        <aries.blueprint.version>1.0.0-incubating-SNAPSHOT</aries.blueprint.version>
+        <aries.jmx.version>1.0.0-incubating-SNAPSHOT</aries.jmx.version>
         <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
         <jansi.version>1.2</jansi.version>
         <jetty.bundle.version>6.1.22_1</jetty.bundle.version>
@@ -101,7 +102,6 @@
         <spring.osgi.version>1.2.0</spring.osgi.version>
         <spring.version>2.5.6.SEC01</spring.version>
         <sshd.version>0.3.0</sshd.version>
-        <osgi.jmx.version>4.2.0.200907080519</osgi.jmx.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>
@@ -613,11 +613,6 @@
                 <version>${sshd.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.impl.bundle.jmx</artifactId>
-                <version>${osgi.jmx.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam</artifactId>
                 <version>${pax.exam.version}</version>
@@ -648,9 +643,9 @@
                 <version>${servlet.api.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.blueprint</groupId>
-                <artifactId>geronimo-blueprint</artifactId>
-                <version>${geronimo.blueprint.version}</version>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint</artifactId>
+                <version>${aries.blueprint.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.felix</groupId>
@@ -659,6 +654,16 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.jmx</groupId>
+                <artifactId>org.apache.aries.jmx</artifactId>
+                <version>${aries.jmx.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.jmx</groupId>
+                <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+                <version>${aries.jmx.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.felix.gogo</groupId>
                 <artifactId>org.apache.felix.gogo.runtime</artifactId>
                 <version>${felix.gogo.version}</version>