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/04 16:00:47 UTC
svn commit: r1369327 - in /karaf/trunk:
assemblies/features/enterprise/src/main/feature/feature.xml pom.xml
Author: jbonofre
Date: Sat Aug 4 14:00:46 2012
New Revision: 1369327
URL: http://svn.apache.org/viewvc?rev=1369327&view=rev
Log:
[KARAF-1705] Introduce aries.jndi.api.version property
Modified:
karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml?rev=1369327&r1=1369326&r2=1369327&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml Sat Aug 4 14:00:46 2012
@@ -44,7 +44,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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1369327&r1=1369326&r2=1369327&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Aug 4 14:00:46 2012
@@ -174,6 +174,7 @@
<aries.jpa.version>1.0.0</aries.jpa.version>
<aries.jpa.api.version>1.0.0</aries.jpa.api.version>
<aries.jndi.version>1.0.0</aries.jndi.version>
+ <aries.jndi.api.version>1.0.0</aries.jndi.api.version>
<aries.proxy.version>1.0.0</aries.proxy.version>
<aries.transaction.version>1.0.0</aries.transaction.version>
<aries.transaction.blueprint.version>1.0.0</aries.transaction.blueprint.version>
@@ -1582,7 +1583,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>