Return-Path: 
 <commits-return-23564-apmail-karaf-commits-archive=karaf.apache.org@karaf.apache.org>
X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org
Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 32D0117EBD
	for <apmail-karaf-commits-archive@minotaur.apache.org>;
 Wed, 22 Apr 2015 11:38:03 +0000 (UTC)
Received: (qmail 8317 invoked by uid 500); 22 Apr 2015 11:38:03 -0000
Delivered-To: apmail-karaf-commits-archive@karaf.apache.org
Received: (qmail 8297 invoked by uid 500); 22 Apr 2015 11:38:03 -0000
Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@karaf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@karaf.apache.org>
List-Post: <mailto:commits@karaf.apache.org>
List-Id: <commits.karaf.apache.org>
Reply-To: dev@karaf.apache.org
Delivered-To: mailing list commits@karaf.apache.org
Received: (qmail 8288 invoked by uid 99); 22 Apr 2015 11:38:03 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 11:38:03 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id F04ADE0060; Wed, 22 Apr 2015 11:38:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: jbonofre@apache.org
To: commits@karaf.apache.org
Message-Id: <67f18decf4a14140bb6a1d683ea56129@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: karaf git commit: [KARAF-3685] Upgrade to Aries JNDI URL 1.1.0
Date: Wed, 22 Apr 2015 11:38:02 +0000 (UTC)

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 8090012b3 -> 1fe6e3a11


[KARAF-3685] Upgrade to Aries JNDI URL 1.1.0


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

Branch: refs/heads/karaf-2.x
Commit: 1fe6e3a110dc08a95b6ea12f7b3937cc1290d0ed
Parents: 8090012
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Apr 22 13:37:40 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Apr 22 13:37:40 2015 +0200

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/resources/features.xml | 2 +-
 pom.xml                                                        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/1fe6e3a1/assemblies/features/enterprise/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/resources/features.xml b/assemblies/features/enterprise/src/main/resources/features.xml
index d596cdc..115512b 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -241,7 +241,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.core.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>
         <conditional>
             <condition>shell</condition>

http://git-wip-us.apache.org/repos/asf/karaf/blob/1fe6e3a1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c927a2..50e2413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,7 @@
         <aries.jndi.version>1.0.0</aries.jndi.version>
         <aries.jndi.api.version>1.1.0</aries.jndi.api.version>
         <aries.jndi.core.version>1.0.2</aries.jndi.core.version>
+        <aries.jndi.url.version>1.1.0</aries.jndi.url.version>
         <aries.proxy.version>1.0.4</aries.proxy.version>
         <aries.proxy.api.version>1.0.1</aries.proxy.api.version>
         <aries.transaction.blueprint.version>1.0.2</aries.transaction.blueprint.version>
@@ -1184,7 +1185,7 @@
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>
                 <artifactId>org.apache.aries.jndi.url</artifactId>
-                <version>${aries.jndi.version}</version>
+                <version>${aries.jndi.url.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>