Author: hadrian
Date: Mon May 30 22:15:25 2011
New Revision: 1129402
URL: http://svn.apache.org/viewvc?rev=1129402&view=rev
Log:
CAMEL-3856. Port fix to camel-2.7.x
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/components/camel-quartz/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:15:25 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:15:25 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771
Modified: camel/branches/camel-2.7.x/components/camel-quartz/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-quartz/pom.xml?rev=1129402&r1=1129401&r2=1129402&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-quartz/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-quartz/pom.xml Mon May 30
22:15:25 2011
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.quartz.*,
+ org.apache.camel.component.quartz.*;${camel.osgi.version},
org.apache.camel.routepolicy.quartz.*
</camel.osgi.export.pkg>
</properties>