Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9CD61E85A for ; Mon, 18 Mar 2013 21:47:42 +0000 (UTC) Received: (qmail 55307 invoked by uid 500); 18 Mar 2013 21:47:31 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 53773 invoked by uid 500); 18 Mar 2013 21:47:30 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 52730 invoked by uid 99); 18 Mar 2013 21:47:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 21:47:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9B9339226; Mon, 18 Mar 2013 21:47:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jvanzyl@apache.org To: commits@maven.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/50] git commit: o Accounted for refactoring of aether-api/-util Message-Id: <20130318214728.A9B9339226@tyr.zones.apache.org> Date: Mon, 18 Mar 2013 21:47:28 +0000 (UTC) o Accounted for refactoring of aether-api/-util Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/25a273f7 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/25a273f7 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/25a273f7 Branch: refs/heads/master Commit: 25a273f744cffde2b2c5c0dd70d536693a01ff8f Parents: 298403b Author: Benjamin Bentmann Authored: Sat Mar 10 17:41:02 2012 +0100 Committer: Benjamin Bentmann Committed: Sat Mar 10 17:41:02 2012 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/maven/DefaultMaven.java | 9 +++++++-- .../plugin/internal/DefaultMavenPluginManager.java | 2 +- .../project/DefaultProjectBuildingHelper.java | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/25a273f7/maven-core/src/main/java/org/apache/maven/DefaultMaven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index b1f239a..1e74cb7 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -87,6 +87,7 @@ import org.eclipse.aether.repository.Authentication; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RepositoryPolicy; import org.eclipse.aether.repository.WorkspaceReader; +import org.eclipse.aether.resolution.ResolutionErrorPolicy; import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; import org.eclipse.aether.util.graph.selector.AndDependencySelector; import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; @@ -102,6 +103,7 @@ import org.eclipse.aether.util.repository.ChainedWorkspaceReader; import org.eclipse.aether.util.repository.DefaultAuthenticationSelector; import org.eclipse.aether.util.repository.DefaultMirrorSelector; import org.eclipse.aether.util.repository.DefaultProxySelector; +import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy; /** * @author Jason van Zyl @@ -360,8 +362,11 @@ public class DefaultMaven session.setUpdatePolicy( null ); } - session.setNotFoundCachingEnabled( request.isCacheNotFound() ); - session.setTransferErrorCachingEnabled( request.isCacheTransferError() ); + int errorPolicy = 0; + errorPolicy |= request.isCacheNotFound() ? ResolutionErrorPolicy.CACHE_NOT_FOUND : 0; + errorPolicy |= request.isCacheTransferError() ? ResolutionErrorPolicy.CACHE_TRANSFER_ERROR : 0; + session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( errorPolicy, errorPolicy + | ResolutionErrorPolicy.CACHE_NOT_FOUND ) ); session.setArtifactTypeRegistry( RepositoryUtils.newArtifactTypeRegistry( artifactHandlerManager ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/25a273f7/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 8184b86..c36bd55 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -92,7 +92,7 @@ import org.eclipse.aether.graph.DependencyFilter; import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.util.filter.AndDependencyFilter; -import org.eclipse.aether.util.graph.PreorderNodeListGenerator; +import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; /** * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such http://git-wip-us.apache.org/repos/asf/maven/blob/25a273f7/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index 0cd6447..1d99343 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -57,7 +57,7 @@ import org.eclipse.aether.graph.DependencyFilter; import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.util.filter.ExclusionsDependencyFilter; -import org.eclipse.aether.util.graph.PreorderNodeListGenerator; +import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; /** * Assists the project builder. Warning: This is an internal utility class that is only public for