-
Notifications
You must be signed in to change notification settings - Fork 3.4k
HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 #6525
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
HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 #6525
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Test failures seems to be unrelated. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
This branch will need to be rebased (or cherry-picked again) when #6525 is merged. |
8f248f1 to
ed50c32
Compare
|
OK, this branch is rebased. I cherry-picked again the whole Bootstrap upgrade master commit. Unfortunately this is still not a 100% clean cherry-pick. I had to resolve some minor conflicts where we had navbars (because the Promotheus links are not there in this branch) and Also added the small fix for |
|
As per response in mail thread, we do not want this for upcoming releases right? Let's hold on merging this until release. |
@NihalJain thanks for pointing out. 👍 Yes, you are right. |
This comment has been minimized.
This comment has been minimized.
ed50c32 to
8b9937f
Compare
|
Fixed blank lines reported by PR build. Rebased. |
This comment has been minimized.
This comment has been minimized.
8b9937f to
d1e419f
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
I think this backport PR is now ready to merge. What do you think @NihalJain ? |
HI @PDavid HBase 2.5.11 release is in progress, we should wait for it to close I think. |
Ah, sure, you are right, thanks. 👍 Sorry, somehow thought that the 2.5.11 release was already done. |
…3.3 (apache#6490) First we upgraded to Bootstrap v4 - this was the majority of the changes - and then I upgraded to Bootstrap 5.3.3 - which is the latest non-vulnerable version according to https://security.snyk.io/package/npm/bootstrap/3.4.1 Changes were based on the migration documentation: - https://getbootstrap.com/docs/4.6/migration/ - https://getbootstrap.com/docs/5.3/migration/ Most of the changes are related to navbar-s, tabs and forms. The new Bootstrap look has a bit bigger font sizes but it is still OK in my opinion. Bootstrap v5 is not requiring JQuery anymore but we have some JQuery plugins (jquery.tablesorter.min.js, tab.js) which still need it so I left JQuery in. - Removed bootstrap-theme.min.css and Glyphicons icon font because these are not present anymore in newer Bootstrap versions. - Upgraded checked in Bootstrap CSS and JS files to v4. - Moved some inline CSS styles to hbase.css file (DRY). - The page-header class was dropped in Bootstrap v4 so added page-header small grey color to hbase.css. - Removed some unused imports in JSP files. - Improved the styling of the Log Level form - Replaced hbase_logo_small.png under thrift module with the hbase-server one. Reason: to make sure that they are the same size (this under thrift was smaller). - Upgraded checked in Bootstrap CSS and JS files to v5. - Migrated navbars for v5: - Navbars now require a container within (to drastically simplify spacing requirements and CSS required). - The .active class can no longer be applied to .nav-items, it must be applied directly on .nav-links. - Migrated data attributes. Data attributes for all Bootstrap JavaScript plugins are now namespaced to help distinguish Bootstrap functionality from third parties and your own code. For example, we use data-bs-toggle instead of data-toggle. - form-inline was dropped in v5, so inline forms had to be styled with grid and utilities instead. - Added the favicon of the HBase website to the web UI pages. Signed-off-by: Nick Dimiduk <[email protected]> Signed-off-by: Nihal Jain <[email protected]> (cherry picked from commit 744ce13)
* There were some changes in the Bootstrap upgrade which caused the test to fail because the test expected certain text to appear on the UI page. (cherry picked from commit 43f728c)
d1e419f to
2451432
Compare
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
Hi @NihalJain, (Just rebased to fix conflicts with base branch.) |
petersomogyi
left a comment
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.
I checked the UI in standalone mode and haven't noticed any issues.
This is the backport of #6490 for
branch-2.5.