-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump com.github.zafarkhaja:java-semver from 0.9.0 to 0.10.2 #17925
Bump com.github.zafarkhaja:java-semver from 0.9.0 to 0.10.2 #17925
Conversation
Bumps [com.github.zafarkhaja:java-semver](https://github.com/zafarkhaja/jsemver) from 0.9.0 to 0.10.2. - [Release notes](https://github.com/zafarkhaja/jsemver/releases) - [Changelog](https://github.com/zafarkhaja/jsemver/blob/master/CHANGELOG.md) - [Commits](zafarkhaja/jsemver@v0.9.0...v0.10.2) --- updated-dependencies: - dependency-name: com.github.zafarkhaja:java-semver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
changelog/unreleased/pr-17925.toml
Outdated
@@ -0,0 +1,9 @@ | |||
type = "c" | |||
message = "Update com.github.zafarkhaja:java-semver from 0.9.0 to 0.10.2." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We usually don't do changelog entries for dependency updates. Exceptions are security fixes.
@@ -178,7 +178,8 @@ private OkHttpClient addAuthenticationIfPresent(URI host, OkHttpClient okHttpCli | |||
|
|||
private Optional<SearchVersion> parseVersion(VersionResponse versionResponse) { | |||
try { | |||
final com.github.zafarkhaja.semver.Version version = com.github.zafarkhaja.semver.Version.valueOf(versionResponse.number()); | |||
String version1 = versionResponse.number(); | |||
final com.github.zafarkhaja.semver.Version version = Version.parse(version1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can inline version1
.
case JsonTokenId.ID_NUMBER_INT: | ||
return Version.forIntegers(p.getIntValue()); | ||
int major = p.getIntValue(); | ||
return Version.of(major); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can inline major
.
@@ -114,10 +114,11 @@ public void doRun() { | |||
final VersionCheckResponse versionCheckResponse = objectMapper.readValue(response.body().byteStream(), VersionCheckResponse.class); | |||
|
|||
final VersionResponse version = versionCheckResponse.version; | |||
final com.github.zafarkhaja.semver.Version reportedVersion = com.github.zafarkhaja.semver.Version.forIntegers(version.major, version.minor, version.patch); | |||
final com.github.zafarkhaja.semver.Version reportedVersion = Version.of(version.major, version.minor, version.patch); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we shorten the variable type to Version
?
|
||
LOG.debug("Version check reports current version: " + versionCheckResponse); | ||
if (reportedVersion.greaterThan(ServerVersion.VERSION.getVersion())) { | ||
Version other = ServerVersion.VERSION.getVersion(); | ||
if (reportedVersion.isHigherThan(other)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can inline other
.
final String qualifier = version.getPreReleaseVersion(); | ||
final String buildMetadata = version.getBuildMetadata(); | ||
String version1 = versionProperties.getProperty(propertyName); | ||
final com.github.zafarkhaja.semver.Version version = com.github.zafarkhaja.semver.Version.parse(version1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can inline version1
.
} else { | ||
// If this is a pre-release version, use the major.minor.patch version for comparison with the other. | ||
// This allows plugins to require a server version of 2.1.0 and it still gets loaded on a 2.1.0-beta.2 server. | ||
// See: https://github.com/Graylog2/graylog2-server/issues/2462 | ||
return com.github.zafarkhaja.semver.Version.valueOf(version.getNormalVersion()).greaterThanOrEqualTo(other.getVersion()); | ||
String version1 = version.toStableVersion().toString(); | ||
com.github.zafarkhaja.semver.Version version2 = com.github.zafarkhaja.semver.Version.parse(version1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can inline version1
.
@kroepke Can you please address my comments and fix the conflicts? I would be good if we can get this update into 6.1. Thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you! 🙏
Bumps com.github.zafarkhaja:java-semver from 0.9.0 to 0.10.2.
Release notes
Sourced from com.github.zafarkhaja:java-semver's releases.
Changelog
Sourced from com.github.zafarkhaja:java-semver's changelog.
Commits
75b5abe
Update for public release 0.10.26614896
Fix Version.toBuilder() bugda52637
Update for public release 0.10.12b77b5b
Fix backward compatibility of Version's getters7fb445e
Update for public release 0.10.021293c7
Tidy up CHANGELOG.md03ba2df
Update maven dependencies34ffe72
Support double-symbol && and || operators in Ranges121c5e3
Simplify Range Expressions section in README77c78c2
Reword Version's main Javadoc commentYou can trigger a rebase of this PR by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditions
will show all of the ignore conditions of the specified dependency@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)