Author: davsclaus
Date: Thu Dec 8 07:53:42 2011
New Revision: 1211775
URL: http://svn.apache.org/viewvc?rev=1211775&view=rev
Log:
CAMEL-4751: fixed camel-guice osgi import range. Thanks to Surya for the patch.
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-guice/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 8 07:53:42 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366
-/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363
+/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774
+/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.7.x/components/camel-guice/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-guice/pom.xml?rev=1211775&r1=1211774&r2=1211775&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-guice/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-guice/pom.xml Thu Dec 8
07:53:42 2011
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg>
<camel.osgi.import.additional>
- com.google.inject*;version="[2,3)"
+ com.google.inject*;version="[1.2,3)"
</camel.osgi.import.additional>
</properties>
