Author: bvahdat
Date: Fri Mar 16 15:07:54 2012
New Revision: 1301584
URL: http://svn.apache.org/viewvc?rev=1301584&view=rev
Log:
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.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-kestrel/pom.xml
camel/branches/camel-2.9.x/parent/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 15:07:54 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831,1300959,1301376,1301394
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831,1300959,1301376,1301394,1301571
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-kestrel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-kestrel/pom.xml?rev=1301584&r1=1301583&r2=1301584&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-kestrel/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-kestrel/pom.xml Fri Mar 16
15:07:54 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.9.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1301584&r1=1301583&r2=1301584&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Fri Mar 16 15:07:54 2012
@@ -150,7 +150,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.1</tagsoup-version>
