Version utility improvements #11411
Open
Version utility improvements #11411
+101
−23
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
See [1]. This is not covered by the Semver4j library's `IvyProcessor` because that matcher does not necessarily cover a strict range of versions. The reason why [2] still passes is that the case is currently covered by the `XRangeProcessor`. This change also implements the case where "+" is not preceeded by "." and prepares for using `IvyProcessor` only. [1]: https://ant.apache.org/ivy/history/2.1.0/settings/version-matchers.html [2]: https://github.com/oss-review-toolkit/ort/blob/9f8f6f0a808ba13fe0da5a6efa6349821153e186/model/src/test/kotlin/PackageCurationTest.kt#L435 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth
force-pushed
the
version-utils-imps
branch
from
a15728a to
e86d16d
Compare
The check against `IVY_VERSION_RANGE_INDICATORS` (which did not actually contain only *Ivy* indicators) was only needed because the Semver4j library by default parses single versions into ranges (like "2" becomes ">= 2.0.0, < 3.0.0"), which made it unusable for checking for version ranges by simply testing whether range parsing fails. However, that behavior came from the `XRangeProcessor` being applied by default, which is a syntax that ORT never officially supported for package curations / configurations. Instead, ORT only ever supported Ivy version ranges officially. So simplify the code by explicitly only using `IvyProcessor` and working on `String`s internally. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth
force-pushed
the
version-utils-imps
branch
from
e86d16d to
1a8c8b1
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #11411 +/- ##
============================================
- Coverage 57.78% 57.77% -0.01%
Complexity 1711 1711
============================================
Files 347 347
Lines 12904 12901 -3
Branches 1238 1236 -2
============================================
- Hits 7456 7453 -3
Misses 5000 5000
Partials 448 448
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
mnonnenmacher
requested changes
Feb 10, 2026
|
|
||
| "[3.3.0,)".getIvyVersionRanges().get() shouldBe listOf( | ||
| listOf(Range("3.3.0", Range.RangeOperator.GTE)) | ||
| ) |
Member
There was a problem hiding this comment.
How about adding a test for + syntax mentioned in the previous commit?
Member
Author
There was a problem hiding this comment.
Done in a new commit.
| import org.ossreviewtoolkit.model.SourceCodeOrigin | ||
| import org.ossreviewtoolkit.model.VcsInfo | ||
| import org.ossreviewtoolkit.model.VcsType | ||
| import org.ossreviewtoolkit.model.utils.hasIvyVersionRange |
Member
There was a problem hiding this comment.
Commit message:
While this renames a public function, it was decided to not mark this as
a breaking change, because it is an ORT utility function that so far has
only been used internally.
How can we know if someone is using it?
Member
Author
There was a problem hiding this comment.
How can we know if someone is using it?
We can't for sure. But as this was only made public recently in cdac3fc (and not taken into use in ort-config yet) I believe the risk is rather low.
Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
Strictly, an `Identifier` cannot *be* an Ivy version, but only *have* one, so reflect this in the naming. While this renames a public function, it was decided to not mark this as a breaking change, because it is an ORT utility function that so far has only been used internally and was only made public recently in cdac3fc. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth
force-pushed
the
version-utils-imps
branch
from
1a8c8b1 to
38094e2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please have a look at the individual commit messages for the details.