Author: dkulp
Date: Wed Mar 14 21:19:12 2012
New Revision: 1300724
URL: http://svn.apache.org/viewvc?rev=1300724&view=rev
Log:
Merged revisions 1300720,1300722 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1300720 | dkulp | 2012-03-14 17:11:29 -0400 (Wed, 14 Mar 2012) | 2 lines
Open up the cxf version range a bit to allow testing with CXF 2.6.0
Use newer version of joda-time that is already an OSGi bundle
........
r1300722 | dkulp | 2012-03-14 17:15:15 -0400 (Wed, 14 Mar 2012) | 1 line
Missed a file
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 14 21:19:12 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml?rev=1300724&r1=1300723&r2=1300724&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml Wed Mar 14
21:19:12 2012
@@ -81,8 +81,8 @@
<javax.el-bundle-version>2.1.0</javax.el-bundle-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jettison-bundle-version>1.3</jettison-bundle-version>
- <jing-bundle-version>20030619_4</jing-bundle-version>
- <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
+ <jing-bundle-version>20030619_5</jing-bundle-version>
+ <jodatime-bundle-version>1.6.2</jodatime-bundle-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<jsch-bundle-version>0.1.44_2</jsch-bundle-version>
<jsendnsca-bundle-version>1.3.1_1</jsendnsca-bundle-version>
Modified:
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1300724&r1=1300723&r2=1300724&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Wed Mar 14 21:19:12 2012
@@ -63,9 +63,9 @@
<feature name='camel-cxf' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<feature>jetty</feature>
- <feature version='[2.4,2.6)'>cxf</feature>
+ <feature version='[2.4,2.7)'>cxf</feature>
<!-- Added cxf-specs feature to workaround the karaf feature validate
issue -->
- <feature version='[2.4,2.6)'>cxf-specs</feature>
+ <feature version='[2.4,2.7)'>cxf-specs</feature>
<bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle>
</feature>
@@ -393,7 +393,7 @@
<bundle dependency='true'>mvn:org.jibx/jibx-run/${jibx-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
</feature>
@@ -724,7 +724,7 @@
<bundle
dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2-bundle-version}</bundle>
