Skip to content

HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 - #6525

Merged
petersomogyi merged 2 commits into
apache:branch-2.5from
PDavid:HBASE-28832-bootstrap-upgrade-5-branch-2.5
Mar 24, 2025
Merged

HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3#6525
petersomogyi merged 2 commits into
apache:branch-2.5from
PDavid:HBASE-28832-bootstrap-upgrade-5-branch-2.5

Conversation

@PDavid

@PDavidPDavid commented Dec 10, 2024

Copy link
Copy Markdown
Contributor

This is the backport of #6490 for branch-2.5.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@PDavid

Copy link
Copy Markdown
ContributorAuthor

Test failures seems to be unrelated.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@PDavid

Copy link
Copy Markdown
ContributorAuthor

This branch will need to be rebased (or cherry-picked again) when #6525 is merged.

@PDavid
PDavidforce-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from 8f248f1 to ed50c32CompareJanuary 9, 2025 11:07
@PDavid

Copy link
Copy Markdown
ContributorAuthor

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 table.jsp but this is very-very close to the original master patch: #6490

Also added the small fix for TestInfoServersACL.

@PDavid
PDavid marked this pull request as ready for review January 9, 2025 11:11
@NihalJain

Copy link
Copy Markdown
Contributor

As per response in mail thread, we do not want this for upcoming releases right? Let's hold on merging this until release.

@PDavid

Copy link
Copy Markdown
ContributorAuthor

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.

@NihalJainNihalJain added the backport This PR is a back port of some issue or issues already committed to master label Jan 9, 2025
@Apache-HBase

This comment has been minimized.

@PDavid
PDavidforce-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from ed50c32 to 8b9937fCompareJanuary 10, 2025 07:02
@PDavid

Copy link
Copy Markdown
ContributorAuthor

Fixed blank lines reported by PR build. Rebased.

@Apache-HBase

This comment has been minimized.

@PDavid
PDavidforce-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from 8b9937f to d1e419fCompareFebruary 28, 2025 13:46
@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@Apache-HBase

This comment has been minimized.

@PDavid

Copy link
Copy Markdown
ContributorAuthor

I think this backport PR is now ready to merge. What do you think @NihalJain ?

@NihalJain

Copy link
Copy Markdown
Contributor

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.

@PDavid

Copy link
Copy Markdown
ContributorAuthor

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 <ndimiduk@apache.org>
Signed-off-by: Nihal Jain <nihaljain.cs@gmail.com>
(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)
@PDavid
PDavidforce-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch from d1e419f to 2451432CompareMarch 18, 2025 16:16
@Apache-HBase

Copy link
Copy Markdown

💔 -1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 48sDocker mode activated.
-0 ⚠️yetus0m 6sUnprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
_ Prechecks _
_ branch-2.5 Compile Tests _
+0 🆗mvndep0m 12sMaven dependency ordering for branch
+1 💚mvninstall3m 5sbranch-2.5 passed
+1 💚compile2m 15sbranch-2.5 passed
+1 💚javadoc3m 44sbranch-2.5 passed
+1 💚shadedjars6m 23sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗mvndep0m 12sMaven dependency ordering for patch
+1 💚mvninstall2m 57sthe patch passed
+1 💚compile2m 18sthe patch passed
+1 💚javac2m 18sthe patch passed
+1 💚javadoc3m 44sthe patch passed
+1 💚shadedjars6m 1spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
-1 ❌unit38m 5s/patch-unit-root.txtroot in the patch failed.
73m 3s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR#6525
Optional Testsjavac javadoc unit compile shadedjars
unameLinux 8b60e330465d 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2.5 / 2451432
Default JavaTemurin-1.8.0_412-b08
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/testReport/
Max. process+thread count2343 (vs. ulimit of 30000)
modulesC: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/console
versionsgit=2.34.1 maven=3.9.8
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase

Copy link
Copy Markdown

🎊 +1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec0m 50sDocker mode activated.
_ Prechecks _
+1 💚dupname0m 1sNo case conflicting files found.
+0 🆗codespell0m 0scodespell was not available.
+0 🆗detsecrets0m 0sdetect-secrets was not available.
+0 🆗jshint0m 0sjshint was not available.
+0 🆗shelldocs0m 0sShelldocs was not available.
+1 💚@author0m 0sThe patch does not contain any @author tags.
+1 💚hbaseanti0m 0sPatch does not have any anti-patterns.
_ branch-2.5 Compile Tests _
+0 🆗mvndep0m 12sMaven dependency ordering for branch
+1 💚mvninstall3m 41sbranch-2.5 passed
+1 💚compile5m 34sbranch-2.5 passed
+1 💚checkstyle1m 28sbranch-2.5 passed
+1 💚spotbugs20m 17sbranch-2.5 passed
+1 💚spotless1m 1sbranch has no errors when running spotless:check.
_ Patch Compile Tests _
+0 🆗mvndep0m 16sMaven dependency ordering for patch
+1 💚mvninstall4m 14sthe patch passed
+1 💚compile6m 31sthe patch passed
+1 💚javac6m 31sthe patch passed
+1 💚blanks0m 0sThe patch has no blanks issues.
+1 💚checkstyle1m 25sthe patch passed
+1 💚shellcheck0m 1sNo new issues.
+1 💚spotbugs20m 21sthe patch passed
+1 💚hadoopcheck37m 28sPatch does not cause any errors with Hadoop 2.10.2 or 3.2.4 3.3.6 3.4.0.
+1 💚spotless1m 40spatch has no errors when running spotless:check.
_ Other Tests _
+1 💚asflicense2m 47sThe patch does not generate ASF License warnings.
111m 30s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/artifact/yetus-general-check/output/Dockerfile
GITHUB PR#6525
Optional Testsdupname asflicense javac spotbugs checkstyle codespell detsecrets compile hadoopcheck hbaseanti spotless jshint shellcheck shelldocs
unameLinux 6d1465ef660d 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2.5 / 2451432
Default JavaEclipse Adoptium-11.0.23+9
Max. process+thread count176 (vs. ulimit of 30000)
modulesC: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/console
versionsgit=2.34.1 maven=3.9.8 spotbugs=4.7.3 shellcheck=0.8.0
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase

Copy link
Copy Markdown

💔 -1 overall

VoteSubsystemRuntimeLogfileComment
+0 🆗reexec10m 26sDocker mode activated.
-0 ⚠️yetus0m 7sUnprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
_ Prechecks _
_ branch-2.5 Compile Tests _
+0 🆗mvndep0m 14sMaven dependency ordering for branch
+1 💚mvninstall5m 17sbranch-2.5 passed
+1 💚compile2m 56sbranch-2.5 passed
+1 💚javadoc4m 13sbranch-2.5 passed
+1 💚shadedjars7m 46sbranch has no errors when building our shaded downstream artifacts.
_ Patch Compile Tests _
+0 🆗mvndep0m 14sMaven dependency ordering for patch
+1 💚mvninstall4m 52sthe patch passed
+1 💚compile2m 53sthe patch passed
+1 💚javac2m 53sthe patch passed
+1 💚javadoc4m 24sthe patch passed
+1 💚shadedjars7m 40spatch has no errors when building our shaded downstream artifacts.
_ Other Tests _
-1 ❌unit429m 52s/patch-unit-root.txtroot in the patch failed.
500m 6s
SubsystemReport/Notes
DockerClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR#6525
Optional Testsjavac javadoc unit compile shadedjars
unameLinux cace924a7d79 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build toolmaven
Personalitydev-support/hbase-personality.sh
git revisionbranch-2.5 / 2451432
Default JavaEclipse Adoptium-11.0.23+9
Test Resultshttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/testReport/
Max. process+thread count4894 (vs. ulimit of 30000)
modulesC: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console outputhttps://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6525/6/console
versionsgit=2.34.1 maven=3.9.8
Powered byApache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@NihalJain

Copy link
Copy Markdown
Contributor

@PDavid So we are good here now? @apurtell Should we go ahead and get this in ?

@PDavid

PDavid commented Mar 19, 2025

Copy link
Copy Markdown
ContributorAuthor

Hi @NihalJain,
Yes, thanks, from my side this is ready.

(Just rebased to fix conflicts with base branch.)

@petersomogyipetersomogyi left a comment

Copy link
Copy Markdown
Contributor

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.

@petersomogyi
petersomogyi merged commit 38d7286 into apache:branch-2.5Mar 24, 2025
@PDavid
PDavid deleted the HBASE-28832-bootstrap-upgrade-5-branch-2.5 branch March 24, 2025 10:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backportThis PR is a back port of some issue or issues already committed to master

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@PDavid@Apache-HBase@NihalJain@petersomogyi