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é <[email protected]> Authored: Wed Apr 22 13:37:40 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> 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>
