You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/09/28 23:56:02 UTC

svn commit: r1002370 - in /servicemix/smx4/nmr/trunk: nmr/core/pom.xml pom.xml

Author: jbonofre
Date: Tue Sep 28 21:56:02 2010
New Revision: 1002370

URL: http://svn.apache.org/viewvc?rev=1002370&view=rev
Log:
[SMX4NMR-225] Upgrade to Karaf 2.1.0.

Modified:
    servicemix/smx4/nmr/trunk/nmr/core/pom.xml
    servicemix/smx4/nmr/trunk/pom.xml

Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=1002370&r1=1002369&r2=1002370&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Tue Sep 28 21:56:02 2010
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.framework.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.felix</groupId>

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1002370&r1=1002369&r2=1002370&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Sep 28 21:56:02 2010
@@ -69,14 +69,12 @@
       <!-- OSGi (Felix framework, Aries, Karaf, Equinox) -->
       <aries.transaction.version>0.2-incubating</aries.transaction.version>
       <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
-      <equinox.version>3.6.0.v20100517</equinox.version>
-      <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
       <felix.configadmin.version>1.2.4</felix.configadmin.version>
       <felix.framework.version>3.0.2</felix.framework.version>
       <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
       <felix.gogo.version>0.4.0</felix.gogo.version>
       <felix.plugin.version>2.1.0</felix.plugin.version>
-      <karaf.version>2.0.0</karaf.version>
+      <karaf.version>2.1.0</karaf.version>
       <osgi.core.version>4.2.0</osgi.core.version>
       
       <!-- ActiveMQ -->