You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by ni...@apache.org on 2012/06/07 17:34:25 UTC

svn commit: r1347682 - /camel/trunk/camel-core/pom.xml

Author: ningjiang
Date: Thu Jun  7 15:34:25 2012
New Revision: 1347682

URL: http://svn.apache.org/viewvc?rev=1347682&view=rev
Log:
CAMEL-5342 fix the conflicts of shaded concurrentlinkedhashmap

Modified:
    camel/trunk/camel-core/pom.xml

Modified: camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1347682&r1=1347681&r2=1347682&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Thu Jun  7 15:34:25 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>