File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ package org.ossreviewtoolkit.model
21
21
22
22
import com.fasterxml.jackson.annotation.JsonProperty
23
23
24
- import org.ossreviewtoolkit.model.utils.isApplicableIvyVersion
24
+ import org.ossreviewtoolkit.model.utils.isApplicableVersionRangeFor
25
25
26
26
/* *
27
27
* Return true if this string equals the [other] string, or if either string is blank.
@@ -59,7 +59,7 @@ data class PackageCuration(
59
59
*/
60
60
fun isApplicable (pkgId : Identifier ): Boolean =
61
61
isApplicableDisregardingVersion(pkgId)
62
- && (id.version.equalsOrIsBlank(pkgId.version) || id.isApplicableIvyVersion (pkgId))
62
+ && (id.version.equalsOrIsBlank(pkgId.version) || id.isApplicableVersionRangeFor (pkgId))
63
63
64
64
/* *
65
65
* Apply the curation [data] to the provided [basePackage] by calling [PackageCurationData.apply], if applicable.
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ import org.ossreviewtoolkit.model.RepositoryProvenance
30
30
import org.ossreviewtoolkit.model.SourceCodeOrigin
31
31
import org.ossreviewtoolkit.model.VcsInfo
32
32
import org.ossreviewtoolkit.model.VcsType
33
- import org.ossreviewtoolkit.model.utils.isApplicableIvyVersion
33
+ import org.ossreviewtoolkit.model.utils.isApplicableVersionRangeFor
34
34
import org.ossreviewtoolkit.model.utils.isVersionRange
35
35
import org.ossreviewtoolkit.utils.common.replaceCredentialsInUri
36
36
@@ -98,7 +98,7 @@ data class PackageConfiguration(
98
98
if (! id.type.equals(otherId.type, ignoreCase = true ) ||
99
99
id.namespace != otherId.namespace ||
100
100
id.name != otherId.name ||
101
- ! id.isApplicableIvyVersion (otherId)
101
+ ! id.isApplicableVersionRangeFor (otherId)
102
102
) {
103
103
return false
104
104
}
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ import org.semver4j.Semver
31
31
* Return true if the version of this [Identifier] interpreted as an Ivy, NPM or CocoaPods version range is applicable
32
32
* to the package with the given [identifier][pkgId].
33
33
*/
34
- internal fun Identifier.isApplicableIvyVersion (pkgId : Identifier ) =
34
+ internal fun Identifier.isApplicableVersionRangeFor (pkgId : Identifier ) =
35
35
runCatching {
36
36
if (version == pkgId.version) return true
37
37
You can’t perform that action at this time.
0 commit comments