Downloader: Fix broken links

Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@here.com>
oss-review-toolkit · Feb 17, 2021 · 278d520 · 278d520
1 parent ce99e9f
commit 278d520
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/analyzer/src/main/kotlin/managers/utils/NodeSupport.kt b/analyzer/src/main/kotlin/managers/utils/NodeSupport.kt
@@ -94,10 +94,10 @@ fun expandNpmShortcutURL(url: String): String {
     if (path.startsWith("git@") || path.startsWith("github.com") || path.startsWith("gitlab.com")) return url
 
     return if (!path.isNullOrEmpty() && listOf(uri.authority, uri.query).all { it == null }) {
-        // See https://docs.npmjs.com/files/package.json#github-urls.
+        // See https://docs.npmjs.com/cli/v7/configuring-npm/package-json#github-urls.
         val revision = if (uri.hasRevisionFragment()) "#${uri.fragment}" else ""
 
-        // See https://docs.npmjs.com/files/package.json#repository.
+        // See https://docs.npmjs.com/cli/v7/configuring-npm/package-json#repository.
         when (uri.scheme) {
             null, "github" -> "https://github.com/$path.git$revision"
             "gist" -> "https://gist.github.com/$path$revision"

diff --git a/downloader/src/main/kotlin/Downloader.kt b/downloader/src/main/kotlin/Downloader.kt
@@ -201,11 +201,11 @@ object Downloader {
                         "see: https://guides.rubygems.org/specification-reference/#metadata"
                 "Gradle" -> " Please make sure the published POM file includes the SCM connection, see: " +
                         "https://docs.gradle.org/current/userguide/publishing_maven.html#" +
-                        "example_customizing_the_pom_file"
+                        "sec:modifying_the_generated_pom"
                 "Maven" -> " Please define the \"connection\" tag within the \"scm\" tag in the POM file, " +
                         "see: http://maven.apache.org/pom.html#SCM"
                 "NPM" -> " Please define the \"repository\" in the package.json file, see: " +
-                        "https://docs.npmjs.com/files/package.json#repository"
+                        "https://docs.npmjs.com/cli/v7/configuring-npm/package-json#repository"
                 "PIP", "PyPI" -> " Please make sure the setup.py defines the 'Source' attribute in " +
                         "'project_urls', see: https://packaging.python.org/guides/" +
                         "distributing-packages-using-setuptools/#project-urls"

diff --git a/reporter/src/funTest/assets/evaluated-model-reporter-test-expected-output.json b/reporter/src/funTest/assets/evaluated-model-reporter-test-expected-output.json
@@ -74,7 +74,7 @@
     "timestamp" : "1970-01-01T00:00:00Z",
     "type" : "SCANNER",
     "source" : "FileCounter",
-    "message" : "DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\nCaused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'. Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#example_customizing_the_pom_file",
+    "message" : "DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\nCaused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'. Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom",
     "severity" : "ERROR",
     "pkg" : 0,
     "scan_result" : 0,

diff --git a/reporter/src/funTest/assets/evaluated-model-reporter-test-expected-output.yml b/reporter/src/funTest/assets/evaluated-model-reporter-test-expected-output.yml
@@ -58,7 +58,7 @@ issues:
   source: "FileCounter"
   message: "DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\n\
     Caused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\
-    \ Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#example_customizing_the_pom_file"
+    \ Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom"
   severity: "ERROR"
   pkg: 0
   scan_result: 0

diff --git a/reporter/src/funTest/assets/file-counter-expected-scan-report.xlsx b/reporter/src/funTest/assets/file-counter-expected-scan-report.xlsx
diff --git a/reporter/src/funTest/assets/static-html-reporter-test-expected-output.html b/reporter/src/funTest/assets/static-html-reporter-test-expected-output.html
@@ -555,7 +555,7 @@ <h3>Packages</h3>
             <td><a href="#issue-1">1</a></td><td>Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0</td><td></td><td><a href="#Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0">Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0</a>
               <ul>
                 <li>
-                  <p>Unknown time [ERROR]: FileCounter - DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.<br>Caused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'. Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#example_customizing_the_pom_file</p>
+                  <p>Unknown time [ERROR]: FileCounter - DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.<br>Caused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'. Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom</p>
                   <p></p>
                 </li>
                 <details>
@@ -625,7 +625,7 @@ <h3 class="">Packages</h3>
             </td><td>
               <ul>
                 <li>
-                  <p>Unknown time [ERROR]: FileCounter - DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.<br>Caused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'. Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#example_customizing_the_pom_file</p>
+                  <p>Unknown time [ERROR]: FileCounter - DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.<br>Caused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'. Please make sure the published POM file includes the SCM connection, see: https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom</p>
                 </li>
               </ul>
             </td>

diff --git a/reporter/src/funTest/assets/static-html-reporter-test-input.yml b/reporter/src/funTest/assets/static-html-reporter-test-input.yml
@@ -302,7 +302,7 @@ scanner:
             message: "DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\n\
               Caused by: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\
               \ Please make sure the published POM file includes the SCM connection,\
-              \ see: https://docs.gradle.org/current/userguide/publishing_maven.html#example_customizing_the_pom_file"
+              \ see: https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom"
             severity: "ERROR"
     - id: "Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0"
       results:

diff --git a/scanner/src/funTest/assets/file-counter-expected-output-for-analyzer-result.yml b/scanner/src/funTest/assets/file-counter-expected-output-for-analyzer-result.yml
@@ -237,7 +237,7 @@ scanner:
               \ DownloadException: Download failed for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\n\
               Suppressed: DownloadException: No VCS URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'.\
               \ Please make sure the published POM file includes the SCM connection,\
-              \ see: https://docs.gradle.org/current/userguide/publishing_maven.html#example_customizing_the_pom_file\n\
+              \ see: https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom\n\
               Suppressed: DownloadException: No source artifact URL provided for 'Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0'."
             severity: "ERROR"
     - id: "Maven:junit:junit:4.12"