Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Update buildIdentifier comparison #11353

Merged
merged 6 commits into from
Jun 30, 2021
Merged

fix: Update buildIdentifier comparison #11353

merged 6 commits into from
Jun 30, 2021

Conversation

caalador
Copy link
Contributor

Fix buildIdentifier comparison so
values compare correctly.

fixes #11352

@caalador caalador force-pushed the issues/11352_buildIdentifierComparison branch from 391f2f4 to d98e05d Compare June 29, 2021 11:33
@caalador
fix: Update buildIdentifier comparison
e410325 
Fix buildIdentifier comparison so
values compare correctly.

fixes #11352
@caalador caalador force-pushed the issues/11352_buildIdentifierComparison branch from d98e05d to e410325 Compare June 29, 2021 11:48
pleku
pleku suggested changes Jun 30, 2021
View reviewed changes
Copy link
Contributor

@pleku pleku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost, one minor comment

flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendVersion.java Outdated Show resolved Hide resolved
flow-server/src/test/java/com/vaadin/flow/server/frontend/FrontendVersionTest.java Outdated Show resolved Hide resolved
@caalador caalador force-pushed the issues/11352_buildIdentifierComparison branch from 7c248fa to b62a552 Compare June 30, 2021 06:09
@manolo
Copy link
Member

manolo commented Jun 30, 2021

Tested manually in my local and works ok.

@pleku pleku merged commit d79a88d into master Jun 30, 2021
@pleku pleku deleted the issues/11352_buildIdentifierComparison branch June 30, 2021 07:38
vaadin-bot pushed a commit that referenced this pull request Jun 30, 2021
@caalador @vaadin-bot
fix: fixes comparison of prerelease versions FE deps (#11353)
0793bd7 
Fix buildIdentifier comparison so values compare correctly.
The problem caused e.g. alphas greater than 10 to be considered older than 2-9.

fixes #11352
@vaadin-bot
Copy link
Collaborator

Hi @caalador and @pleku, when i performed cherry-pick to this commit to 6.0, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick d79a88d
error: could not apply d79a88d... fix: fixes comparison of prerelease versions FE deps (#11353)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

@vaadin-bot
Copy link
Collaborator

Hi @caalador and @pleku, when i performed cherry-pick to this commit to 2.7, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick d79a88d
error: could not apply d79a88d... fix: fixes comparison of prerelease versions FE deps (#11353)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

@vaadin-bot
Copy link
Collaborator

Hi @caalador and @pleku, when i performed cherry-pick to this commit to 2.6, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick d79a88d
error: could not apply d79a88d... fix: fixes comparison of prerelease versions FE deps (#11353)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

vaadin-bot added a commit that referenced this pull request Jun 30, 2021
@vaadin-bot @caalador
fix: fixes comparison of prerelease versions FE deps (#11353) (#11361)
4928aa0 
Fix buildIdentifier comparison so values compare correctly.
The problem caused e.g. alphas greater than 10 to be considered older than 2-9.

fixes #11352

Co-authored-by: caalador <[email protected]>
caalador added a commit that referenced this pull request Jun 30, 2021
@caalador
fix: fixes comparison of prerelease versions FE deps (#11353)
6029663 
Fix buildIdentifier comparison so values compare correctly.
The problem caused e.g. alphas greater than 10 to be considered older than 2-9.

fixes #11352
# Conflicts:
#	flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendVersion.java
pleku pushed a commit that referenced this pull request Jun 30, 2021
@caalador
fix: fixes comparison of prerelease versions FE deps (#11353) (#11364)
d8b262c 
Fix buildIdentifier comparison so values compare correctly.
The problem caused e.g. alphas greater than 10 to be considered older than 2-9.

fixes #11352
vaadin-bot pushed a commit that referenced this pull request Jun 30, 2021
@caalador @vaadin-bot
fix: fixes comparison of prerelease versions FE deps (#11353) (#11364)
53d5fc5 
Fix buildIdentifier comparison so values compare correctly.
The problem caused e.g. alphas greater than 10 to be considered older than 2-9.

fixes #11352
vaadin-bot added a commit that referenced this pull request Jun 30, 2021
@vaadin-bot @caalador
fix: fixes comparison of prerelease versions FE deps (#11353) (#11364) (
422648a 
#11366)

Fix buildIdentifier comparison so values compare correctly.
The problem caused e.g. alphas greater than 10 to be considered older than 2-9.

fixes #11352

Co-authored-by: caalador <[email protected]>
@vaadin-bot
Copy link
Collaborator

This ticket/PR has been released with platform 21.0.0.beta1 and is also targeting the upcoming stable 21.0.0 version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pleku pleku pleku approved these changes

@manolo manolo manolo approved these changes

Assignees
No one assigned
Labels
cherry-picked-7.0 need to pick manually 2.6 need to pick manually 2.7 need to pick manually 6.0 prerelease version for platform 21.0.0 Released with Platform 21.0.0.beta1 +0.0.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Faulty comparison for buildIdentifier in FrontendVersion
4 participants
@caalador @manolo @vaadin-bot @pleku