deps: update dependency org.semver4j:semver4j to v5.2.0

oss-review-toolkit · Sep 25, 2023 · 0420946 · 0420946
1 parent 0705ede
commit 0420946
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/downloader/src/main/kotlin/VersionControlSystem.kt b/downloader/src/main/kotlin/VersionControlSystem.kt
@@ -410,6 +410,6 @@ abstract class VersionControlSystem(
      */
     fun isAtLeastVersion(expectedVersion: String): Boolean {
         val actualVersion = Semver.coerce(getVersion())
-        return actualVersion.isGreaterThanOrEqualTo(Semver.coerce(expectedVersion))
+        return Semver.coerce(expectedVersion)?.let { actualVersion?.isGreaterThanOrEqualTo(it) } == true
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -51,7 +51,7 @@ retrofit = "2.9.0"
 retrofitConverterKotlinxSerialization = "1.0.0"
 saxonHe = "12.3"
 scanoss = "1.1.6"
-semver4j = "5.1.0"
+semver4j = "5.2.0"
 springCore = "5.3.30"
 svnkit = "1.10.11"
 sw360Client = "16.0.0-m1"

diff --git a/model/src/main/kotlin/PackageCuration.kt b/model/src/main/kotlin/PackageCuration.kt
@@ -80,7 +80,7 @@ data class PackageCuration(
                     "'${id.version}' is not a valid version range."
                 }
 
-                return Semver.coerce(pkgId.version).satisfies(range)
+                return Semver.coerce(pkgId.version)?.satisfies(range) == true
             }
 
             return false

diff --git a/plugins/commands/requirements/src/main/kotlin/RequirementsCommand.kt b/plugins/commands/requirements/src/main/kotlin/RequirementsCommand.kt
@@ -129,7 +129,7 @@ class RequirementsCommand : OrtCommand(
                             val actualVersion = tool.getVersion()
                             runCatching {
                                 val isRequiredVersion = tool.getVersionRequirement().let {
-                                    Semver.coerce(actualVersion).satisfies(it)
+                                    Semver.coerce(actualVersion)?.satisfies(it) == true
                                 }
 
                                 if (isRequiredVersion) {

diff --git a/utils/common/src/main/kotlin/CommandLineTool.kt b/utils/common/src/main/kotlin/CommandLineTool.kt
@@ -104,7 +104,7 @@ interface CommandLineTool {
         val actualVersion = Semver.coerce(getVersion(workingDir))
         val requiredVersion = getVersionRequirement()
 
-        if (!actualVersion.satisfies(requiredVersion)) {
+        if (actualVersion?.satisfies(requiredVersion) != true) {
             logger.warn {
                 "The command is required in version $requiredVersion, but you are using version $actualVersion. This " +
                     "could lead to problems."