Merge pull request #59 from spdx/issue58

Change error to warning on bad URLs
spdx · Oct 6, 2022 · 66c6830 · 66c6830
2 parents 65bc0c8 + 6d285d2
commit 66c6830
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/main/java/org/spdx/maven/SpdxDependencyInformation.java b/src/main/java/org/spdx/maven/SpdxDependencyInformation.java
@@ -439,7 +439,11 @@ packageName, new SpdxNoAssertionLicense(), copyright, declaredLicense )
         }
         if ( model.getUrl() != null )
         {
-            retval.setHomepage( model.getUrl() );
+            try {
+                retval.setHomepage( model.getUrl() );
+            } catch ( InvalidSPDXAnalysisException e ) {
+                log.warn( "Invalid homepage for dependency " + model.getArtifactId() + ": " + model.getUrl() );
+            }
         }
         return retval;
     }

diff --git a/src/main/java/org/spdx/maven/SpdxDocumentBuilder.java b/src/main/java/org/spdx/maven/SpdxDocumentBuilder.java
@@ -370,7 +370,16 @@ private SpdxPackage createSpdxPackage( SpdxProjectInformation projectInformation
         {
             copyrightText = UNSPECIFIED;
         }
-        String downloadUrl = projectInformation.getDownloadUrl();
+        String downloadUrl = null;
+
+        if ( SpdxVerificationHelper.isValidUri( projectInformation.getDownloadUrl() ))
+        {
+            downloadUrl = projectInformation.getDownloadUrl();
+        }
+        else
+        {
+            log.warn( "Invalid download location in POM file: " + projectInformation.getDownloadUrl() );
+        }
         if ( downloadUrl == null )
         {
             downloadUrl = UNSPECIFIED;
@@ -437,7 +446,15 @@ private SpdxPackage createSpdxPackage( SpdxProjectInformation projectInformation
             // home page
             if ( projectInformation.getHomePage() != null )
             {
-                pkg.setHomepage( projectInformation.getHomePage() );
+                try
+                {
+                    pkg.setHomepage( projectInformation.getHomePage() );
+                }
+                catch( InvalidSPDXAnalysisException ex ) 
+                {
+                    log.warn( "Invalid URL in project POM file: "+projectInformation.getHomePage() );
+                }
+
             }
             // source information
             if ( projectInformation.getSourceInfo() != null )