Author: bvahdat Date: Fri Mar 16 15:11:46 2012 New Revision: 1301590 URL: http://svn.apache.org/viewvc?rev=1301590&view=rev Log: Merged revisions 1301584 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1301584 | bvahdat | 2012-03-16 16:07:54 +0100 (Fr, 16 Mrz 2012) | 9 lines Merged revisions 1301571 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1301571 | bvahdat | 2012-03-16 16:00:37 +0100 (Fr, 16 Mrz 2012) | 1 line CAMEL-5092: Make use of the Couchbase Repo for spymemcached dependency. Also upgrade the used version to 2.8.0. Thanks to Chris Geer for providing the patch. ........ ................ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-kestrel/pom.xml camel/branches/camel-2.8.x/parent/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 16 15:11:46 2012 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871,1292116,1292389,1292726,1292769,1293082,1293935,1294044,1294589,1294914,1294978,1299165,1300806,1300835,1300845,1300960,1301401,1301405 -/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848,1292114,1292384,1292725,1292767,1293079,1293828,1293855,1294588,1294909,1294976,1298993,1300805,1300826,1300831,1300959,1301376,1301394 +/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871,1292116,1292389,1292726,1292769,1293082,1293935,1294044,1294589,1294914,1294978,1299165,1300806,1300835,1300845,1300960,1301401,1301405,1301584 +/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848,1292114,1292384,1292725,1292767,1293079,1293828,1293855,1294588,1294909,1294976,1298993,1300805,1300826,1300831,1300959,1301376,1301394,1301571 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-kestrel/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-kestrel/pom.xml?rev=1301590&r1=1301589&r2=1301590&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-kestrel/pom.xml (original) +++ camel/branches/camel-2.8.x/components/camel-kestrel/pom.xml Fri Mar 16 15:11:46 2012 @@ -38,10 +38,10 @@ <!-- TODO: we should use SMX bundle JAR --> <repositories> <repository> - <id>spy</id> - <name>Spy Repository</name> + <id>couchbase.repo</id> + <name>Couchbase Repository</name> <layout>default</layout> - <url>http://bleu.west.spy.net/~dustin/m2repo/</url> + <url>http://files.couchbase.com/maven2/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -57,7 +57,7 @@ <dependency> <groupId>spy</groupId> - <artifactId>memcached</artifactId> + <artifactId>spymemcached</artifactId> <version>${spymemcached-version}</version> </dependency> Modified: camel/branches/camel-2.8.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1301590&r1=1301589&r2=1301590&view=diff ============================================================================== --- camel/branches/camel-2.8.x/parent/pom.xml (original) +++ camel/branches/camel-2.8.x/parent/pom.xml Fri Mar 16 15:11:46 2012 @@ -146,7 +146,7 @@ <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>3.0.7.RELEASE</spring-security-version> <spring-ws-version>2.0.3.RELEASE</spring-ws-version> - <spymemcached-version>2.5</spymemcached-version> + <spymemcached-version>2.8.0</spymemcached-version> <stax-api-version>1.0.1</stax-api-version> <stringtemplate-version>3.0</stringtemplate-version> <tagsoup-version>1.2</tagsoup-version>
