Fix #314 ErrorRemedy.xmlOutput should log the issues on error level r…

…ather than debug
mojohaus · Mar 27, 2019 · f8d1b1a · f8d1b1a
1 parent c320755
commit f8d1b1a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java
@@ -1205,7 +1205,7 @@ private void downloadLicenses( LicenseDownloader licenseDownloader, ProjectLicen
 
         if ( matchingUrlsOnly && ( depProject.getLicenses() == null || depProject.getLicenses().isEmpty() ) )
         {
-            handleError( depProject, "No license information available for: " + depProject );
+            handleError( depProject, "No license information available for: " + depProject.toGavString() );
             return;
         }
 
@@ -1215,7 +1215,7 @@ private void downloadLicenses( LicenseDownloader licenseDownloader, ProjectLicen
             if ( matchingUrlsOnly && license.getUrl() == null )
             {
                 handleError( depProject, "No URL for license at index " + licenseIndex + " in dependency "
-                    + depProject.toString() );
+                    + depProject.toGavString() );
             }
             else if ( license.getUrl() != null )
             {
@@ -1308,20 +1308,20 @@ else if ( licenseOutputFile.exists() )
                 }
                 catch ( URISyntaxException e )
                 {
-                    handleError( depProject, "POM for dependency " + depProject.toString()
+                    handleError( depProject, "POM for dependency " + depProject.toGavString()
                         + " has an invalid license URL: " + licenseUrl );
                     getLog().debug( e );
                 }
                 catch ( FileNotFoundException e )
                 {
-                    handleError( depProject, "POM for dependency " + depProject.toString()
+                    handleError( depProject, "POM for dependency " + depProject.toGavString()
                         + " has a license URL that returns file not found: " + licenseUrl );
                     getLog().debug( e );
                 }
                 catch ( IOException e )
                 {
                     handleError( depProject, "Unable to retrieve license from URL '" + licenseUrl + "' for dependency '"
-                        + depProject.toString() + "': " + e.getMessage() );
+                        + depProject.toGavString() + "': " + e.getMessage() );
                     getLog().debug( e );
                 }
             }
@@ -1363,7 +1363,7 @@ private void handleError( ProjectLicenseInfo depProject, String msg ) throws Moj
                 case failFast:
                     throw new MojoFailureException( msg );
                 case xmlOutput:
-                    getLog().debug( msg );
+                    getLog().error( msg );
                     depProject.addDownloaderMessage( msg );
                     break;
                 default:

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,7 +169,8 @@ public void loadProjectDependencies( ResolvedProjectDependencies artifacts,
                 }
                 catch ( ProjectBuildingException e )
                 {
-                    laBuilder.errorMessage( e.getClass().getSimpleName() + ": " + e.getMessage() );
+                    laBuilder.errorMessage( "Could not create effective POM for '" + id + "': "
+                        + e.getClass().getSimpleName() + ": " + e.getMessage() );
                 }
 
                 depMavenProject = laBuilder.build();

diff --git a/src/main/java/org/codehaus/mojo/license/download/ProjectLicenseInfo.java b/src/main/java/org/codehaus/mojo/license/download/ProjectLicenseInfo.java
@@ -173,6 +173,11 @@ public String toString()
         return getId();
     }
 
+    public String toGavString()
+    {
+        return groupId + ":" + artifactId + ( version == null ? "" : ( ":" + version ) );
+    }
+
     /**
      * {@inheritDoc}
      */