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.

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

3.1 cherry pick #8880

Merged
merged 17 commits into from
Aug 24, 2020
Merged

3.1 cherry pick #8880

merged 17 commits into from
Aug 24, 2020

Conversation

haijian-vaadin
Copy link
Contributor

DON'T SQUASH

TatuLund and others added 9 commits June 1, 2020 11:39
If you use container (such as the latest Wilfdly) which forces to use significantly newer version of Jsoup than Vaadin depends to, this can cause a problem as deprecated method as been removed.
Removes highlighting blocks, extra whitespace and changes output block
about application start up to a oneliner.

Fixes #8404, 8395
Related to #8104
Also take into account that
chunk modules may have
submodules.

Fixes #8493
Fixes vaadin/platform#1251

# Conflicts:
#	flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java
#	flow-server/src/test/java/com/vaadin/flow/server/frontend/NodeUpdaterTest.java
* Revert "Revert "Revert "delay location.reload when session expires (#7707)" (#7789)""

This reverts commit 98fedc0.

* chore: split router session expiration test cases
if (logger.isWarnEnabled()) {
logger.warn(String.join("\n", warnings));
}
} else if (!info.isEmpty()) {
info.add(0, HEADER);
info.add(SEPARATOR);
if (logger.isInfoEnabled()) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

MAJOR Merge this if statement with the enclosing one. rule

@mshabarov
Copy link
Contributor

These commits haven't been picked from master yet. Let's do it within this CP PR:

hfazai and others added 7 commits August 24, 2020 15:23
* fixing error message when fails to load content of index.html

* adding import

* code enhancement

* code enhancement and adding test

* enhancement

* simulate index-html absence by rename

* adding space and assert rename file
* Add transmission semantic for URI attribute values

Fixes #8813

* Add some comments, correct javadocs

* Fix GWT tests

* Use one magic method instead of another

* Check the type of JsonValue before read it
* Avoid findIndex JS Array function.

Fixes #8711

* Fix indentation
* Make a workaround for Spring boot run as jar

Fixes #8705

* Add a unit test for implemented workaround.

* Add forgotten resource

* Improve variable name and add comments
@haijian-vaadin
Copy link
Contributor Author

Picked all the mentioned commits except
Improve log message for skipping (p)pnpm install (#8819)
since it depends on another commit which introduces new APIs

mshabarov
mshabarov previously approved these changes Aug 24, 2020
* @throws UnsupportedOperationException
*/
@Override
public void setId(String id) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

MINOR Remove this method to simply inherit it. rule

@vaadin-bot
Copy link
Collaborator

SonarQube analysis reported 2 issues

  • MAJOR 1 major
  • MINOR 1 minor

Watch the comments in this conversation to review them.

@vaadin-bot vaadin-bot added +0.1.0 and removed +0.0.1 labels Aug 24, 2020
@mshabarov
Copy link
Contributor

+0.1.0 caused by Extend javadocs for Text and clarify not-supported API (#8799), which is fine, because it only changes the javadoc and throws UnsupposrtedOperationException.

@mshabarov mshabarov merged commit 8e6ce86 into 3.1 Aug 24, 2020
@mshabarov mshabarov deleted the cp/3.1 branch August 24, 2020 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants