Author: cmoulliard
Date: Sun Jan 16 14:34:30 2011
New Revision: 1059572
URL: http://svn.apache.org/viewvc?rev=1059572&view=rev
Log:
KARAF-394: add aries-application in features enterprise file + made small
enhancements
Modified:
karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
karaf/trunk/pom.xml
Modified:
karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml?rev=1059572&r1=1059571&r2=1059572&view=diff
==============================================================================
--- karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
(original)
+++ karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
Sun Jan 16 14:34:30 2011
@@ -52,7 +52,7 @@
<feature name="application-without-isolation"
version="${aries.application.version}">
<!-- pre-requisites-->
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
-
<bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy/aries.proxy.version</bundle>
+
<bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
<bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<feature version="${project.version}">obr</feature>
<!-- commom -->
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1059572&r1=1059571&r2=1059572&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sun Jan 16 14:34:30 2011
@@ -133,8 +133,10 @@
<aries.application.version>0.3-SNAPSHOT</aries.application.version>
<aries.blueprint.version>0.3-SNAPSHOT</aries.blueprint.version>
<aries.jmx.version>0.3-SNAPSHOT</aries.jmx.version>
+ <aries.jpa.version>0.3-SNAPSHOT</aries.jpa.version>
<aries.jndi.version>0.3-SNAPSHOT</aries.jndi.version>
<aries.proxy.version>0.3-SNAPSHOT</aries.proxy.version>
+ <aries.transaction.version>0.3-SNAPSHOT</aries.transaction.version>
<aries.util.version>0.3-SNAPSHOT</aries.util.version>
<jansi.version>1.4</jansi.version>
<jline.version>2.5</jline.version>