maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject [32/50] git commit: [MNG-4737] removed dependency on backport-util-concurrent
Date Sat, 01 Dec 2012 10:39:57 GMT
[MNG-4737] removed dependency on backport-util-concurrent

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@965646 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/23aed6ff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/23aed6ff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/23aed6ff

Branch: refs/heads/maven-2.2.x
Commit: 23aed6ff937331ba073251f998f2721df7a94785
Parents: ff0d40d
Author: Herve Boutemy <hboutemy@apache.org>
Authored: Mon Jul 19 21:36:16 2010 +0000
Committer: Herve Boutemy <hboutemy@apache.org>
Committed: Mon Jul 19 21:36:16 2010 +0000

----------------------------------------------------------------------
 maven-artifact-manager/pom.xml                     |    6 +----
 .../artifact/resolver/DefaultArtifactResolver.java |   19 +++++++--------
 pom.xml                                            |    5 ----
 3 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/23aed6ff/maven-artifact-manager/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact-manager/pom.xml b/maven-artifact-manager/pom.xml
index 50f7d6d..57780c0 100644
--- a/maven-artifact-manager/pom.xml
+++ b/maven-artifact-manager/pom.xml
@@ -61,10 +61,6 @@ under the License.
       <artifactId>wagon-provider-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-    </dependency>
-    <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>1.2_Java1.3</version>
@@ -72,7 +68,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>edu.umd.cs.mtc</groupId>
-      <artifactId>multithreadedtc-jdk14</artifactId>
+      <artifactId>multithreadedtc</artifactId>
       <version>1.01</version>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/maven/blob/23aed6ff/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 323ac0c..e582842 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -29,6 +29,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -48,11 +52,6 @@ import org.apache.maven.wagon.TransferFailedException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.FileUtils;
 
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 public class DefaultArtifactResolver
     extends AbstractLogEnabled
     implements ArtifactResolver
@@ -77,26 +76,26 @@ public class DefaultArtifactResolver
         super();
         resolveArtifactPool =
             new ThreadPoolExecutor( DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE, 3, TimeUnit.SECONDS,
-                                    new LinkedBlockingQueue() );
+                                    new LinkedBlockingQueue<Runnable>() );
     }
 
     // ----------------------------------------------------------------------
     // Implementation
     // ----------------------------------------------------------------------
 
-    public void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository
)
+    public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
         resolve( artifact, remoteRepositories, localRepository, false );
     }
 
-    public void resolveAlways( Artifact artifact, List remoteRepositories, ArtifactRepository
localRepository )
+    public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
         resolve( artifact, remoteRepositories, localRepository, true );
     }
 
-    private void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository
localRepository,
+    private void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
                           boolean force )
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
@@ -178,7 +177,7 @@ public class DefaultArtifactResolver
                 Date comparisonDate = new Date( destination.lastModified() );
 
                 // cull to list of repositories that would like an update
-                repositories = new ArrayList( remoteRepositories );
+                repositories = new ArrayList<ArtifactRepository>( remoteRepositories
);
                 for ( Iterator i = repositories.iterator(); i.hasNext(); )
                 {
                     ArtifactRepository repository = (ArtifactRepository) i.next();

http://git-wip-us.apache.org/repos/asf/maven/blob/23aed6ff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0105abd..d1b0f63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,11 +426,6 @@ under the License.
         <version>1.5.6</version>
       </dependency>
       <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <version>3.1</version>
-      </dependency>
-      <dependency>
         <groupId>easymock</groupId>
         <artifactId>easymock</artifactId>
         <version>1.2_Java1.3</version>


Mime
View raw message