You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/04/22 16:42:16 UTC

[2/5] git commit: [KARAF-2929] Upgrade to Aries JNDI Url 1.1

[KARAF-2929] Upgrade to Aries JNDI Url 1.1

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/48318e0e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/48318e0e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/48318e0e

Branch: refs/heads/master
Commit: 48318e0e50f400de6f3b526c5f1dba1c16c5d0b1
Parents: 0f6f738
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Apr 22 16:15:15 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Apr 22 16:15:15 2014 +0200

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml | 2 +-
 pom.xml                                                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/48318e0e/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index a0b8141..fedc19d 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -178,7 +178,7 @@
         <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>
+        <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.legacy.support/${aries.jndi.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.jndi/org.apache.karaf.jndi.core/${project.version}</bundle>
     </feature>

http://git-wip-us.apache.org/repos/asf/karaf/blob/48318e0e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e2263c..325878b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,7 @@
         <aries.jpa.container.context.version>1.0.1</aries.jpa.container.context.version>
         <aries.jndi.version>1.0.0</aries.jndi.version>
         <aries.jndi.api.version>1.0.0</aries.jndi.api.version>
+        <aries.jndi.url.version>1.1.0-SNAPSHOT</aries.jndi.url.version>
         <aries.proxy.version>1.0.2</aries.proxy.version>
         <aries.proxy.api.version>1.0.0</aries.proxy.api.version>
         <aries.subsystem.version>1.0.1-SNAPSHOT</aries.subsystem.version>