karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-3554] Upgrade to Aries JNDI Core 1.0.2
Date Sun, 01 Mar 2015 19:50:49 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x a41dc38d1 -> d41cb94fd


[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/d41cb94f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d41cb94f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d41cb94f

Branch: refs/heads/karaf-2.x
Commit: d41cb94fdfdbb1bfa97da823404250c1331a1b77
Parents: a41dc38
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Mar 1 20:50:23 2015 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Mar 1 20:50:23 2015 +0100

----------------------------------------------------------------------
 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/d41cb94f/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 73ee1f8..1be745d 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -239,7 +239,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.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/d41cb94f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 976090f..42cd2a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,6 +183,7 @@
         <aries.jpa.blueprint.version>1.0.4</aries.jpa.blueprint.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.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.1</aries.transaction.blueprint.version>
@@ -1178,7 +1179,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>


Mime
View raw message