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: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 #11935

Merged
merged 3 commits into from
Sep 28, 2021
Merged

fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 #11935

merged 3 commits into from
Sep 28, 2021

Conversation

Artur-
Copy link
Member

@Artur- Artur- commented Sep 27, 2021 •
edited
Loading

Fixes #10103, #10510

@Artur- Artur- marked this pull request as ready for review September 27, 2021 12:00
@Artur-
Copy link
Member Author

Artur- commented Sep 27, 2021

I can only guess that the Atmosphere regressions have been fixed in 2.7.1 or 2.7.2 as this works and 2.7.0 in #10582 does not work

@Artur-
Copy link
Member Author

Artur- commented Sep 27, 2021

or more probably fixed in the javascript client Atmosphere/atmosphere-javascript@javascript-project-3.1.0...javascript-project-3.1.2

denis-anisimov
denis-anisimov reviewed Sep 27, 2021
View reviewed changes
pom.xml Outdated
@@ -162,6 +161,10 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>testing-atmosphere</id>
Copy link
Contributor

Choose a reason for hiding this comment

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

So the vaadin atmosphere version is not released yet?
Should it be released and this removed after that ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, crap :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

@denis-anisimov
Copy link
Contributor

Atmosphere/atmosphere-javascript@javascript-project-3.1.0...javascript-project-3.1.2

It looks like the truth.

@Artur-
Revert "for testing only"
286b7e0 
This reverts commit b47277d.
@denis-anisimov
Copy link
Contributor

Failure to find com.vaadin.external.atmosphere:atmosphere-runtime:jar:2.7.2.slf4jvaadin1 in https://repo.maven.apache.org/maven2

@vaadin-bot
Copy link
Collaborator

SonarQube analysis reported 31 issues

  • INFO 31 info

Top 10 issues

  1. INFO Constants.java#L43: Do not forget to remove this deprecated code someday. rule
  2. INFO Constants.java#L62: Do not forget to remove this deprecated code someday. rule
  3. INFO Constants.java#L69: Do not forget to remove this deprecated code someday. rule
  4. INFO Constants.java#L77: Do not forget to remove this deprecated code someday. rule
  5. INFO Constants.java#L84: Do not forget to remove this deprecated code someday. rule
  6. INFO Constants.java#L91: Do not forget to remove this deprecated code someday. rule
  7. INFO Constants.java#L99: Do not forget to remove this deprecated code someday. rule
  8. INFO Constants.java#L107: Do not forget to remove this deprecated code someday. rule
  9. INFO Constants.java#L115: Do not forget to remove this deprecated code someday. rule
  10. INFO Constants.java#L123: Do not forget to remove this deprecated code someday. rule

@Artur-
Copy link
Member Author

Artur- commented Sep 28, 2021

Everything seems ok now

@denis-anisimov denis-anisimov merged commit e6459b3 into master Sep 28, 2021
@denis-anisimov denis-anisimov deleted the atmosphere-2.7.2 branch September 28, 2021 11:35
@denis-anisimov
Copy link
Contributor

I guess we should cherry-pick it to all the previous versions.
I will add labels for the versions. Remove the ones which should not be used for cherry-picks if any.

@vaadin-bot
Copy link
Collaborator

Hi @Artur- and @denis-anisimov, when i performed cherry-pick to this commit to 8.0, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick e6459b3
error: could not apply e6459b3... fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 (#11935)
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 @Artur- and @denis-anisimov, 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 e6459b3
error: could not apply e6459b3... fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 (#11935)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

@Artur-
Copy link
Member Author

Artur- commented Sep 28, 2021

That would require cherry-picking #11934 also

@vaadin-bot
Copy link
Collaborator

Hi @Artur- and @denis-anisimov, when i performed cherry-pick to this commit to 7.0, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick e6459b3
error: could not apply e6459b3... fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 (#11935)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

haijian-vaadin added a commit that referenced this pull request Sep 30, 2021
@haijian-vaadin
Revert "fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 (#11935
30f7725 
)"

This reverts commit e6459b3.
haijian-vaadin added a commit that referenced this pull request Sep 30, 2021
@haijian-vaadin
Revert atmosphere changes (#11953)
2e9d837 
* Revert "fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 (#11935)"

This reverts commit e6459b3.

* Revert "chore: Download Atmosphere JS instead of having it in the project (#11934)"

This reverts commit bb04952.
@vaadin-bot
Copy link
Collaborator

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

Artur- added a commit that referenced this pull request Nov 4, 2021
@Artur-
fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2 (#11935)
bfb410b 
fix: Upgrade to Atmosphere 2.7.2 and Atmosphere JS 3.1.2

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

@denis-anisimov denis-anisimov denis-anisimov approved these changes

Assignees
No one assigned
Labels
need to pick manually 2.7 need to pick manually 7.0 need to pick manually 8.0 prerelease version for platform 22.0.0 Released with Platform 22.0.0.alpha5 +0.0.1
Projects
None yet
Milestone
No milestone
3 participants
@Artur- @denis-anisimov @vaadin-bot