Author: ningjiang
Date: Fri Jun 8 02:04:36 2012
New Revision: 1347862
URL: http://svn.apache.org/viewvc?rev=1347862&view=rev
Log:
Merged revisions 1347682 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1347682 | ningjiang | 2012-06-07 23:34:25 +0800 (Thu, 07 Jun 2012) | 1 line
CAMEL-5342 fix the conflicts of shaded concurrentlinkedhashmap
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1347682
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/pom.xml?rev=1347862&r1=1347861&r2=1347862&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/pom.xml (original)
+++ camel/branches/camel-2.9.x/camel-core/pom.xml Fri Jun 8 02:04:36 2012
@@ -125,6 +125,12 @@
<include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
</includes>
</artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.googlecode.concurrentlinkedhashmap</pattern>
+
<shadedPattern>org.apache.camel.com.googlecode.concurrentlinkedhashmap</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
