camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1164653 - in /camel/branches/camel-2.8.x: ./ components/camel-rss/pom.xml components/camel-soap/pom.xml
Date Fri, 02 Sep 2011 17:39:31 GMT
Author: davsclaus
Date: Fri Sep  2 17:39:31 2011
New Revision: 1164653

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


Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-rss/pom.xml
    camel/branches/camel-2.8.x/components/camel-soap/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 17:39:31 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557,1164633

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-rss/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-rss/pom.xml?rev=1164653&r1=1164652&r2=1164653&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-rss/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-rss/pom.xml Fri Sep  2 17:39:31 2011
@@ -32,7 +32,7 @@
   <description>Camel RSS support</description>
   
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.rss.*;org.apache.camel.dataformat.rss.*</camel.osgi.export.pkg>
+    <camel.osgi.export.pkg>org.apache.camel.component.rss.*;${camel.osgi.version},org.apache.camel.dataformat.rss.*</camel.osgi.export.pkg>
   </properties>
  
   <dependencies>

Modified: camel/branches/camel-2.8.x/components/camel-soap/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-soap/pom.xml?rev=1164653&r1=1164652&r2=1164653&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-soap/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-soap/pom.xml Fri Sep  2 17:39:31 2011
@@ -33,7 +33,7 @@
 
     <properties>
         <camel.osgi.import.before.defaults>javax.xml.ws;version="[0.0,3)"</camel.osgi.import.before.defaults>
-        <camel.osgi.export.pkg>org.apache.camel.dataformat.soap.*, org.xmlsoap.schemas.soap.envelope.*
+        <camel.osgi.export.pkg>org.apache.camel.dataformat.soap.*;${camel.osgi.version},org.xmlsoap.schemas.soap.envelope.*
         </camel.osgi.export.pkg>
     </properties>
 



Mime
View raw message