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 2015/03/01 12:07:43 UTC
karaf git commit: [KARAF-3554] Upgrade to Aries JNDI Core 1.0.2
Repository: karaf
Updated Branches:
refs/heads/master 28a9f0cb9 -> 083799f64
[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/083799f6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/083799f6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/083799f6
Branch: refs/heads/master
Commit: 083799f645dae5ed23348e23720e4311a578ef3e
Parents: 28a9f0c
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Mar 1 12:07:03 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Mar 1 12:07:03 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/083799f6/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 dd199d6..bd73608 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -240,7 +240,7 @@
<feature>aries-proxy</feature>
<bundle start-level="30">mvn:org.apache.xbean/xbean-naming/${xbean.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/083799f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 62e7073..90bf59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,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>
@@ -1642,7 +1643,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>