camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1143927 - in /camel/branches/camel-2.7.x: ./ components/camel-http/ parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Date Thu, 07 Jul 2011 17:13:22 GMT
Author: dkulp
Date: Thu Jul  7 17:13:21 2011
New Revision: 1143927

URL: http://svn.apache.org/viewvc?rev=1143927&view=rev
Log:
Merged revisions 1143925 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1143925 | dkulp | 2011-07-07 13:11:14 -0400 (Thu, 07 Jul 2011) | 2 lines
  
  [CAMEL-4186] Pull cxf stuff out of camel-cxf feature.  Use version range
  for cxf version in feature.
........

Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/components/camel-http/   (props changed)
    camel/branches/camel-2.7.x/parent/pom.xml
    camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  7 17:13:21 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364,1143925

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul  7 17:13:21 2011
@@ -1,2 +1 @@
-/camel/trunk:1-1088794,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364
-
+/camel/trunk:1-1088794,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364,1143925

Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  7 17:13:21 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1099417,1102162,1104076,1124497,1131411,1134501,1135364,1143925

Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1143927&r1=1143926&r2=1143927&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Thu Jul  7 17:13:21 2011
@@ -124,7 +124,7 @@
     <saxon-version>9.1.0.8</saxon-version>
     <scala-version>2.8.1</scala-version>
     <scala-plugin-version>2.15.0</scala-plugin-version>
-    <servicemix-specs-version>1.7.0</servicemix-specs-version>
+    <servicemix-specs-version>1.8.0</servicemix-specs-version>
     <shiro-bundle-version>1.1.0_1</shiro-bundle-version>
     <slf4j-version>1.6.1</slf4j-version>
     <smack-version>3.1.0</smack-version>

Modified: camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml?rev=1143927&r1=1143926&r2=1143927&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml Thu
Jul  7 17:13:21 2011
@@ -48,7 +48,7 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
   </feature> 
-  <feature name='camel-cxf' version='${pom.version}' resolver='(obr)'>
+  <feature name='cxf' version='${pom.version}' resolver='(obr)'>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
     <bundle dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle>
@@ -87,8 +87,11 @@
     <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
     <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
+  </feature>
+  <feature name='camel-cxf' version='${pom.version}' resolver='(obr)'>
     <feature version='${pom.version}'>camel-spring</feature>
     <feature>jetty</feature>
+    <feature version='[2.3,3)'>cxf</feature>
     <bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
   </feature>
   <feature name='camel-cache' version='${pom.version}' resolver='(obr)'>



Mime
View raw message