You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/02/26 07:25:01 UTC

svn commit: r1293749 - in /karaf/trunk: assemblies/features/enterprise/src/main/feature/feature.xml pom.xml

Author: jbonofre
Date: Sun Feb 26 06:25:00 2012
New Revision: 1293749

URL: http://svn.apache.org/viewvc?rev=1293749&view=rev
Log:
[KARAF-1172] Update to Aries JNDI 0.3.2-SNASPHOT

Modified:
    karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
    karaf/trunk/pom.xml

Modified: karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml?rev=1293749&r1=1293748&r2=1293749&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml Sun Feb 26 06:25:00 2012
@@ -44,7 +44,7 @@
     <feature name='jndi' description='OSGi Service Registry JNDI access' version='${aries.jndi.version}' resolver='(obr)'>
         <details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}</details>
         <bundle start-level='30'>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.api.version}</bundle>
         <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.version}</bundle>
         <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/${aries.jndi.version}</bundle>
         <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.jndi.version}</bundle>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1293749&r1=1293748&r2=1293749&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sun Feb 26 06:25:00 2012
@@ -165,7 +165,8 @@
         <aries.blueprint.jexl.evaluator.version>0.1.0</aries.blueprint.jexl.evaluator.version>
         <aries.jmx.version>0.3</aries.jmx.version>
         <aries.jpa.version>0.3</aries.jpa.version>
-        <aries.jndi.version>0.3</aries.jndi.version>
+        <aries.jndi.api.version>0.3</aries.jndi.api.version>
+        <aries.jndi.version>0.3.2-SNAPSHOT</aries.jndi.version>
         <aries.proxy.api.version>0.4</aries.proxy.api.version>
         <aries.proxy.impl.version>0.4.1-SNAPSHOT</aries.proxy.impl.version>
         <aries.quiesce.api.version>0.3</aries.quiesce.api.version>
@@ -1320,7 +1321,7 @@
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>
                 <artifactId>org.apache.aries.jndi.api</artifactId>
-                <version>${aries.jndi.version}</version>
+                <version>${aries.jndi.api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>