Fix mojohaus#308 Dependencies with broken POMs ignored

ppalaga · Mar 7, 2019 · c23185b · c23185b
1 parent 92a75a9
commit c23185b
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 15 deletions.
diff --git a/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java
@@ -772,6 +772,15 @@ public void execute()
                 getLog().debug( "Checking licenses for project " + artifact );
                 final ProjectLicenseInfo depProject = createDependencyProject( artifact );
                 matchers.replaceMatches( depProject );
+
+                /* Copy the messages and handle them via handleError() that may eventually add them back */
+                final List<String> msgs = new ArrayList<>( depProject.getDownloaderMessages() );
+                depProject.getDownloaderMessages().clear();
+                for ( String msg : msgs )
+                {
+                    handleError( depProject, msg );
+                }
+
                 depProjectLicenses.add( depProject );
             }
             if ( !offline )
@@ -1074,19 +1083,26 @@ private Proxy findActiveProxy()
      *
      * @param depMavenProject the dependency maven project
      * @return DependencyProject with artifact and license info
+     * @throws MojoFailureException
      */
-    private ProjectLicenseInfo createDependencyProject( LicensedArtifact depMavenProject )
+    private ProjectLicenseInfo createDependencyProject( LicensedArtifact depMavenProject ) throws MojoFailureException
     {
-        ProjectLicenseInfo dependencyProject =
+        final ProjectLicenseInfo dependencyProject =
             new ProjectLicenseInfo( depMavenProject.getGroupId(), depMavenProject.getArtifactId(),
                                     depMavenProject.getVersion() );
-        List<org.codehaus.mojo.license.download.License> licenses = depMavenProject.getLicenses();
+        final List<org.codehaus.mojo.license.download.License> licenses = depMavenProject.getLicenses();
         for ( org.codehaus.mojo.license.download.License license : licenses )
         {
             dependencyProject.addLicense( new ProjectLicense( license.getName(), license.getUrl(),
                                                               license.getDistribution(), license.getComments(),
                                                               null ) );
         }
+        List<String> msgs = depMavenProject.getErrorMessages();
+        for ( String msg : msgs )
+        {
+            dependencyProject.addDownloaderMessage( msg );
+        }
+
         return dependencyProject;
     }
 

diff --git a/src/main/java/org/codehaus/mojo/license/download/LicenseMatchers.java b/src/main/java/org/codehaus/mojo/license/download/LicenseMatchers.java
@@ -120,6 +120,7 @@ public void replaceMatches( ProjectLicenseInfo dependency )
                     dependency.setLicenses( matcher.cloneLicenses() );
                 }
                 dependency.setApproved( true );
+                dependency.getDownloaderMessages().clear();
             }
         }
     }

diff --git a/src/main/java/org/codehaus/mojo/license/download/LicensedArtifact.java b/src/main/java/org/codehaus/mojo/license/download/LicensedArtifact.java
@@ -38,13 +38,25 @@ public static Builder builder( String groupId, String artifactId, String version
         return new Builder( groupId, artifactId, version );
     }
 
-    LicensedArtifact( String groupId, String artifactId, String version, List<License> licenses )
+    private final String groupId;
+
+    private final String artifactId;
+
+    private final String version;
+
+    private final List<License> licenses;
+
+    private final List<String> errorMessages;
+
+    LicensedArtifact( String groupId, String artifactId, String version, List<License> licenses,
+                      List<String> errorMessages )
     {
         super();
         this.groupId = groupId;
         this.artifactId = artifactId;
         this.version = version;
         this.licenses = licenses;
+        this.errorMessages = errorMessages;
     }
 
     @Override
@@ -102,14 +114,6 @@ else if ( !version.equals( other.version ) )
         // CHECKSTYLE_ON: NeedBraces
     }
 
-    private final String groupId;
-
-    private final String artifactId;
-
-    private final String version;
-
-    private final List<License> licenses;
-
     public String getGroupId()
     {
         return groupId;
@@ -130,6 +134,11 @@ public List<License> getLicenses()
         return licenses;
     }
 
+    public List<String> getErrorMessages()
+    {
+        return errorMessages;
+    }
+
     /**
      * A {@link LicensedArtifact} builder.
      */
@@ -152,6 +161,14 @@ public Builder( String groupId, String artifactId, String version )
 
         private List<License> licenses = new ArrayList<>();
 
+        private List<String> errorMessages = new ArrayList<>();
+
+        public Builder errorMessage( String errorMessage )
+        {
+            this.errorMessages.add( errorMessage );
+            return this;
+        }
+
         public Builder license( License license )
         {
             this.licenses.add( license );
@@ -162,7 +179,9 @@ public LicensedArtifact build()
         {
             final List<License> lics = Collections.unmodifiableList( licenses );
             licenses = null;
-            return new LicensedArtifact( groupId, artifactId, version, lics );
+            final List<String> msgs = Collections.unmodifiableList( errorMessages );
+            errorMessages = null;
+            return new LicensedArtifact( groupId, artifactId, version, lics, msgs );
         }
     }
 

diff --git a/src/main/java/org/codehaus/mojo/license/download/LicensedArtifactResolver.java b/src/main/java/org/codehaus/mojo/license/download/LicensedArtifactResolver.java
@@ -169,8 +169,7 @@ public void loadProjectDependencies( ResolvedProjectDependencies artifacts,
                 }
                 catch ( ProjectBuildingException e )
                 {
-                    log.warn( "Unable to obtain POM for artifact : " + artifact, e );
-                    continue;
+                    laBuilder.errorMessage( e.getClass().getSimpleName() + ": " + e.getMessage() );
                 }
 
                 depMavenProject = laBuilder.build();