Repository: karaf Updated Branches: refs/heads/karaf-3.0.x bc5e5e312 -> 6b513a55b
[KARAF-3554] Upgrade to Aries JNDI Core 1.0.2 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6b513a55 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6b513a55 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6b513a55 Branch: refs/heads/karaf-3.0.x Commit: 6b513a55ba9f9b645553767dbf9cdeba9e7ce0ba Parents: bc5e5e3 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Mar 1 19:55:32 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Mar 1 19:55:32 2015 +0100 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 2 +- pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6b513a55/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 f81ec03..919b2fa 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -220,7 +220,7 @@ <bundle start-level="30">mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.jndi/org.apache.karaf.jndi.core/${project.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.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.url.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/6b513a55/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1693cde..f2cbf31 100644 --- a/pom.xml +++ b/pom.xml @@ -195,6 +195,7 @@ <aries.jpa.container.context.version>1.0.4</aries.jpa.container.context.version> <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> @@ -1619,7 +1620,7 @@ <dependency> <groupId>org.apache.aries.jndi</groupId> <artifactId>org.apache.aries.jndi.core</artifactId> - <version>${aries.jndi.version}</version> + <version>${aries.jndi.core.version}</version> </dependency> <dependency> <groupId>org.apache.aries.jndi</groupId>
