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 2012/08/03 17:00:05 UTC
svn commit: r1369007 - in /karaf/branches/karaf-2.3.x:
assemblies/features/enterprise/src/main/resources/features.xml pom.xml
Author: jbonofre
Date: Fri Aug 3 15:00:05 2012
New Revision: 1369007
URL: http://svn.apache.org/viewvc?rev=1369007&view=rev
Log:
[KARAF-1706] Reintroduce aries.jndi.api.version property
Modified:
karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml
karaf/branches/karaf-2.3.x/pom.xml
Modified: karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml?rev=1369007&r1=1369006&r2=1369007&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml Fri Aug 3 15:00:05 2012
@@ -42,7 +42,7 @@
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${aries.jndi.version}" resolver="(obr)">
<details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}</details>
<bundle start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.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.rmi/${aries.jndi.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.jndi.version}</bundle>
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1369007&r1=1369006&r2=1369007&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Fri Aug 3 15:00:05 2012
@@ -141,6 +141,7 @@
<aries.jmx.blueprint.core.version>1.0.0</aries.jmx.blueprint.core.version>
<aries.jpa.version>1.0.0</aries.jpa.version>
<aries.jndi.version>1.0.0</aries.jndi.version>
+ <aries.jndi.api.version>1.0.0</aries.jndi.api.version>
<aries.proxy.api.version>1.0.0</aries.proxy.api.version>
<aries.proxy.impl.version>1.0.0</aries.proxy.impl.version>
<aries.transaction.version>1.0.0</aries.transaction.version>
@@ -953,7 +954,7 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
- <version>${aries.jndi.version}</version>
+ <version>${aries.jndi.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>