You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/05/18 05:25:12 UTC
svn commit: r1339964 - in /camel/branches/camel-2.8.x: ./
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Fri May 18 03:25:11 2012
New Revision: 1339964
URL: http://svn.apache.org/viewvc?rev=1339964&view=rev
Log:
Merged revisions 1336248 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................
r1336248 | ningjiang | 2012-05-09 23:49:47 +0800 (Wed, 09 May 2012) | 9 lines
Merged revisions 1336004 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1336004 | ningjiang | 2012-05-09 16:49:50 +0800 (Wed, 09 May 2012) | 1 line
CAMEL-5257 fix camel-jpa feature install issue
........
................
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1336004
Merged /camel/branches/camel-2.9.x:r1336248
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1339964&r1=1339963&r2=1339964&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Fri May 18 03:25:11 2012
@@ -392,6 +392,9 @@
</feature>
<feature name='camel-jpa' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
+ <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+ <!-- TODO replace the jetty feature by a Karaf spec feature -->
+ <feature>jetty</feature>
<feature version='[3,4)'>spring-tx</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>