You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/07/19 23:36:16 UTC
svn commit: r965646 - in /maven/maven-2/branches/maven-2.2.x:
maven-artifact-manager/pom.xml
maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
pom.xml
Author: hboutemy
Date: Mon Jul 19 21:36:16 2010
New Revision: 965646
URL: http://svn.apache.org/viewvc?rev=965646&view=rev
Log:
[MNG-4737] removed dependency on backport-util-concurrent
Modified:
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/pom.xml
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/maven-2/branches/maven-2.2.x/pom.xml
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/pom.xml?rev=965646&r1=965645&r2=965646&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/pom.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/pom.xml Mon Jul 19 21:36:16 2010
@@ -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>
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=965646&r1=965645&r2=965646&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Mon Jul 19 21:36:16 2010
@@ -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.TransferFa
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();
Modified: maven/maven-2/branches/maven-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/pom.xml?rev=965646&r1=965645&r2=965646&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/pom.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/pom.xml Mon Jul 19 21:36:16 2010
@@ -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>