Description: Fix FTBFS with libgoogle-collections >= 1.0
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2011-05-31
Forwarded: no
--- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
+++ b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
@@ -82,7 +82,7 @@
         }
 
         // Get all valid component descriptors
-        Multimap<String, ComponentDescriptor<?>> roleHintIndex = Multimaps.newLinkedHashMultimap();
+        Multimap<String, ComponentDescriptor<?>> roleHintIndex = com.google.common.collect.LinkedHashMultimap.create();
         for ( ClassRealm realm : realms )
         {
             SortedMap<String, Multimap<String, ComponentDescriptor<?>>> roleIndex = index.get( realm );
@@ -189,7 +189,7 @@
         Multimap<String, ComponentDescriptor<?>> roleHintIndex = roleIndex.get( role );
         if ( roleHintIndex == null )
         {
-            roleHintIndex = Multimaps.newLinkedHashMultimap();
+            roleHintIndex = com.google.common.collect.LinkedHashMultimap.create();
             roleIndex.put( role, roleHintIndex );
         }
         roleHintIndex.put( componentDescriptor.getRoleHint(), componentDescriptor );