You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/01/16 15:43:28 UTC

[maven] branch MNG-6732 created (now a6f80d7)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MNG-6732
in repository https://gitbox.apache.org/repos/asf/maven.git.


      at a6f80d7  Fix format

This branch includes the following new commits:

     new 922f604  [MNG-6732] - DefaultArtifactDescriptorReader to check IGNORE_MISSING policy upon ArtifactTransferException
     new a6f80d7  Fix format

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[maven] 02/02: Fix format

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-6732
in repository https://gitbox.apache.org/repos/asf/maven.git

commit a6f80d770ea5be71cc301db7ea462f294e88e97f
Author: Tomo Suzuki <su...@google.com>
AuthorDate: Mon Aug 12 15:49:34 2019 -0400

    Fix format
---
 .../maven/repository/internal/DefaultArtifactDescriptorReader.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index dfcca07..52ef066 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -247,7 +247,7 @@ public class DefaultArtifactDescriptorReader
                 Throwable cause = e.getCause();
                 if ( cause instanceof ArtifactNotFoundException || cause instanceof ArtifactTransferException )
                 {
-                    missingDescriptor( session, trace, a, (Exception) cause);
+                    missingDescriptor( session, trace, a, (Exception) cause );
                     if ( ( getPolicy( session, a, request ) & ArtifactDescriptorPolicy.IGNORE_MISSING ) != 0 )
                     {
                         return null;


[maven] 01/02: [MNG-6732] - DefaultArtifactDescriptorReader to check IGNORE_MISSING policy upon ArtifactTransferException

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-6732
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 922f60445de5e72ff7a6d5fd3dcfc739e3817768
Author: Tomo Suzuki <su...@google.com>
AuthorDate: Mon Aug 12 13:35:46 2019 -0400

    [MNG-6732] - DefaultArtifactDescriptorReader to check IGNORE_MISSING policy upon ArtifactTransferException
---
 .../maven/repository/internal/DefaultArtifactDescriptorReader.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 586c83e..dfcca07 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -68,6 +68,7 @@ import org.eclipse.aether.resolution.VersionResult;
 import org.eclipse.aether.spi.locator.Service;
 import org.eclipse.aether.spi.locator.ServiceLocator;
 import org.eclipse.aether.transfer.ArtifactNotFoundException;
+import org.eclipse.aether.transfer.ArtifactTransferException;
 
 /**
  * @author Benjamin Bentmann
@@ -243,9 +244,10 @@ public class DefaultArtifactDescriptorReader
             }
             catch ( ArtifactResolutionException e )
             {
-                if ( e.getCause() instanceof ArtifactNotFoundException )
+                Throwable cause = e.getCause();
+                if ( cause instanceof ArtifactNotFoundException || cause instanceof ArtifactTransferException )
                 {
-                    missingDescriptor( session, trace, a, (Exception) e.getCause() );
+                    missingDescriptor( session, trace, a, (Exception) cause);
                     if ( ( getPolicy( session, a, request ) & ArtifactDescriptorPolicy.IGNORE_MISSING ) != 0 )
                     {
                         return null;