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/07/30 10:45:44 UTC

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

Author: jbonofre
Date: Mon Jul 30 08:45:44 2012
New Revision: 1367036

URL: http://svn.apache.org/viewvc?rev=1367036&view=rev
Log:
[KARAF-1689] Upgrade to Aries JNDI URL 1.0.0

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=1367036&r1=1367035&r2=1367036&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml Mon Jul 30 08:45:44 2012
@@ -47,7 +47,7 @@
         <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.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.url.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.jndi.version}</bundle>
         <bundle start-level='30'>mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle>
     </feature>
 

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1367036&r1=1367035&r2=1367036&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Jul 30 08:45:44 2012
@@ -175,7 +175,6 @@
         <aries.jmx.version>1.0.0</aries.jmx.version>
         <aries.jpa.version>1.0.0</aries.jpa.version>
         <aries.jndi.version>1.0.0</aries.jndi.version>
-        <aries.jndi.url.version>1.0.0-SNAPSHOT</aries.jndi.url.version>
         <aries.proxy.version>1.0.0</aries.proxy.version>
         <aries.quiesce.api.version>1.0.0</aries.quiesce.api.version>
         <aries.quiesce.manager.version>1.0.0-SNAPSHOT</aries.quiesce.manager.version>
@@ -1611,7 +1610,7 @@
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>
                 <artifactId>org.apache.aries.jndi.url</artifactId>
-                <version>${aries.jndi.url.version}</version>
+                <version>${aries.jndi.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>