[maven-scm] copy for tag plexus-containers-1.5.3

safestarcode · Jan 24, 2010 · 9cf6588 · 9cf6588
2 parents 12c1010 + 763bda9
commit 9cf6588
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/plexus-container-default/pom.xml b/plexus-container-default/pom.xml
@@ -28,8 +28,8 @@
       <artifactId>xbean-reflect</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.code.google-collections</groupId>
-      <artifactId>google-collect</artifactId>
+      <groupId>com.google.collections</groupId>
+      <artifactId>google-collections</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/...lt/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java b/...lt/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
@@ -37,6 +37,7 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 
+import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 
@@ -74,8 +75,9 @@ private Multimap<String, ComponentDescriptor<?>> getComponentDescriptors( String
             realms.addAll( index.keySet() );
         }
 
+
         // Get all valid component descriptors
-        Multimap<String, ComponentDescriptor<?>> roleHintIndex = Multimaps.newLinkedHashMultimap();
+        Multimap<String, ComponentDescriptor<?>> roleHintIndex = LinkedHashMultimap.create();
         for ( ClassRealm realm : realms )
         {
             SortedMap<String, Multimap<String, ComponentDescriptor<?>>> roleIndex = index.get( realm );
@@ -219,7 +221,7 @@ public void addComponentDescriptor( ComponentDescriptor<?> componentDescriptor )
         Multimap<String, ComponentDescriptor<?>> roleHintIndex = roleIndex.get( role );
         if ( roleHintIndex == null )
         {
-            roleHintIndex = Multimaps.newLinkedHashMultimap();
+            roleHintIndex = LinkedHashMultimap.create();
             roleIndex.put( role, roleHintIndex );
         }
         roleHintIndex.put( componentDescriptor.getRoleHint(), componentDescriptor );

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.5</version>
   </parent>
 
   <artifactId>plexus-containers</artifactId>
@@ -95,9 +95,9 @@
         <version>2.0.9</version>
       </dependency>
       <dependency>
-        <groupId>com.google.code.google-collections</groupId>
-        <artifactId>google-collect</artifactId>
-        <version>snapshot-20080530</version>
+        <groupId>com.google.collections</groupId>
+        <artifactId>google-collections</artifactId>
+        <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>