HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 by PDavid · Pull Request #6526 · apache/hbase

PDavid · 2024-12-10T11:06:39Z

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

PDavid · 2025-01-07T08:27:46Z

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

PDavid · 2025-01-08T14:33:44Z

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

Also added the small fix for TestInfoServersACL.

PDavid · 2025-01-09T08:43:50Z

The TestAcidGuaranteesWithAdaptivePolicy test failed in the PR build - it seems unrelated to me.

NihalJain · 2025-01-09T12:12:59Z

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

PDavid · 2025-01-09T12:18:29Z

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.

PDavid · 2025-03-04T09:36:36Z

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

NihalJain · 2025-03-05T05:22:50Z

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

Yes +1 from my end.

Hi, @Apache9, @apurtell Should we go ahead and merge this to branch-2.6? We are already done with our 2.6.2 releases.

Apache9 · 2025-03-05T08:17:58Z

We have already merged the PR for other branches?

NihalJain · 2025-03-05T08:49:12Z

We have already merged the PR for other branches?

Yes it is in place for branch-2+

…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)

Apache-HBase · 2025-03-19T09:41:12Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	1m 7s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 1s		No case conflicting files found.
+0 🆗	codespell	0m 0s		codespell was not available.
+0 🆗	detsecrets	0m 0s		detect-secrets was not available.
+0 🆗	jshint	0m 0s		jshint was not available.
+0 🆗	shelldocs	0m 0s		Shelldocs was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	hbaseanti	0m 0s		Patch does not have any anti-patterns.
			_ branch-2.6 Compile Tests _
+0 🆗	mvndep	0m 15s		Maven dependency ordering for branch
+1 💚	mvninstall	4m 34s		branch-2.6 passed
+1 💚	compile	8m 44s		branch-2.6 passed
+1 💚	checkstyle	1m 38s		branch-2.6 passed
+1 💚	spotbugs	16m 12s		branch-2.6 passed
+1 💚	spotless	1m 0s		branch has no errors when running spotless:check.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 17s		Maven dependency ordering for patch
+1 💚	mvninstall	4m 35s		the patch passed
+1 💚	compile	9m 12s		the patch passed
+1 💚	javac	9m 12s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	1m 50s		the patch passed
+1 💚	shellcheck	0m 0s		No new issues.
+1 💚	spotbugs	13m 37s		the patch passed
+1 💚	hadoopcheck	20m 20s		Patch does not cause any errors with Hadoop 2.10.2 or 3.3.6 3.4.0.
+1 💚	spotless	1m 8s		patch has no errors when running spotless:check.
			_ Other Tests _
+1 💚	asflicense	1m 4s		The patch does not generate ASF License warnings.
		89m 6s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/artifact/yetus-general-check/output/Dockerfile
GITHUB PR	#6526
Optional Tests	dupname asflicense javac spotbugs checkstyle codespell detsecrets compile hadoopcheck hbaseanti spotless jshint shellcheck shelldocs
uname	Linux 1f14d8a82b82 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 tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `33e578c`
Default Java	Eclipse Adoptium-11.0.23+9
Max. process+thread count	181 (vs. ulimit of 30000)
modules	C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/console
versions	git=2.34.1 maven=3.9.8 spotbugs=4.7.3 shellcheck=0.8.0
Powered by	Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

Apache-HBase · 2025-03-19T13:57:19Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	1m 13s		Docker mode activated.
-0 ⚠️	yetus	0m 7s		Unprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
			_ Prechecks _
			_ branch-2.6 Compile Tests _
+0 🆗	mvndep	0m 20s		Maven dependency ordering for branch
+1 💚	mvninstall	5m 11s		branch-2.6 passed
+1 💚	compile	3m 21s		branch-2.6 passed
+1 💚	javadoc	5m 2s		branch-2.6 passed
+1 💚	shadedjars	8m 41s		branch has no errors when building our shaded downstream artifacts.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 15s		Maven dependency ordering for patch
+1 💚	mvninstall	4m 19s		the patch passed
+1 💚	compile	2m 55s		the patch passed
+1 💚	javac	2m 55s		the patch passed
+1 💚	javadoc	4m 36s		the patch passed
+1 💚	shadedjars	8m 38s		patch has no errors when building our shaded downstream artifacts.
			_ Other Tests _
-1 ❌	unit	292m 19s	/patch-unit-root.txt	root in the patch failed.
		345m 11s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR	#6526
Optional Tests	javac javadoc unit compile shadedjars
uname	Linux a1c3939cd234 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 tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `33e578c`
Default Java	Eclipse Adoptium-17.0.11+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/testReport/
Max. process+thread count	4942 (vs. ulimit of 30000)
modules	C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/console
versions	git=2.34.1 maven=3.9.8
Powered by	Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

Apache-HBase · 2025-03-19T14:05:35Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	1m 3s		Docker mode activated.
-0 ⚠️	yetus	0m 6s		Unprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
			_ Prechecks _
			_ branch-2.6 Compile Tests _
+0 🆗	mvndep	0m 12s		Maven dependency ordering for branch
+1 💚	mvninstall	3m 59s		branch-2.6 passed
+1 💚	compile	2m 47s		branch-2.6 passed
+1 💚	javadoc	4m 1s		branch-2.6 passed
+1 💚	shadedjars	6m 42s		branch has no errors when building our shaded downstream artifacts.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 14s		Maven dependency ordering for patch
+1 💚	mvninstall	3m 5s		the patch passed
+1 💚	compile	2m 10s		the patch passed
+1 💚	javac	2m 10s		the patch passed
+1 💚	javadoc	2m 59s		the patch passed
+1 💚	shadedjars	6m 17s		patch has no errors when building our shaded downstream artifacts.
			_ Other Tests _
-1 ❌	unit	312m 23s	/patch-unit-root.txt	root in the patch failed.
		353m 36s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/artifact/yetus-jdk11-hadoop3-check/output/Dockerfile
GITHUB PR	#6526
Optional Tests	javac javadoc unit compile shadedjars
uname	Linux 6d1302ad3a54 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 tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `33e578c`
Default Java	Eclipse Adoptium-11.0.23+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/testReport/
Max. process+thread count	7905 (vs. ulimit of 30000)
modules	C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/console
versions	git=2.34.1 maven=3.9.8
Powered by	Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

Apache-HBase · 2025-03-19T15:31:41Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 47s		Docker mode activated.
-0 ⚠️	yetus	0m 5s		Unprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
			_ Prechecks _
			_ branch-2.6 Compile Tests _
+0 🆗	mvndep	0m 10s		Maven dependency ordering for branch
+1 💚	mvninstall	2m 33s		branch-2.6 passed
+1 💚	compile	1m 43s		branch-2.6 passed
+1 💚	javadoc	2m 45s		branch-2.6 passed
+1 💚	shadedjars	5m 20s		branch has no errors when building our shaded downstream artifacts.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 12s		Maven dependency ordering for patch
+1 💚	mvninstall	2m 23s		the patch passed
+1 💚	compile	1m 44s		the patch passed
+1 💚	javac	1m 44s		the patch passed
-0 ⚠️	javadoc	1m 32s	/results-javadoc-javadoc-root.txt	root generated 10 new + 90 unchanged - 10 fixed = 100 total (was 100)
+1 💚	shadedjars	5m 15s		patch has no errors when building our shaded downstream artifacts.
			_ Other Tests _
+1 💚	unit	406m 11s		root in the patch passed.
		439m 44s

Subsystem	Report/Notes
Docker	ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/artifact/yetus-jdk8-hadoop2-check/output/Dockerfile
GITHUB PR	#6526
Optional Tests	javac javadoc unit compile shadedjars
uname	Linux e10398d126d7 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 tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.6 / `33e578c`
Default Java	Temurin-1.8.0_412-b08
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/testReport/
Max. process+thread count	7971 (vs. ulimit of 30000)
modules	C: hbase-resource-bundle hbase-http hbase-server hbase-thrift hbase-rest . U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6526/5/console
versions	git=2.34.1 maven=3.9.8
Powered by	Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

petersomogyi · 2025-03-24T08:56:11Z

I checked the UI in standalone mode and haven't noticed any issues.

This comment has been minimized.
Sign in to view

PDavid marked this pull request as ready for review December 10, 2024 14:17

PDavid mentioned this pull request Dec 10, 2024
HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 #6490
Merged

This comment has been minimized.
Sign in to view

PDavid marked this pull request as draft December 19, 2024 10:18

This was referenced Jan 7, 2025
HBASE-29028 Backport missing UI patches to branch-2.5 #6542
Merged
HBASE-29036 Backport missing UI patches to branch-2.6 #6550
Merged

PDavid force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.6 branch from 59553ca to fd2e275Compare January 8, 2025 14:31

This comment has been minimized.
Sign in to view

PDavid marked this pull request as ready for review January 9, 2025 08:50

NihalJain added the backport This PR is a back port of some issue or issues already committed to master label Jan 9, 2025

PDavid force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.6 branch from fd2e275 to 9973b95Compare March 1, 2025 11:40

This comment has been minimized.
Sign in to view

PDavid added 2 commits March 18, 2025 14:15

[ADDENDUM] HBASE-28832 Fixed TestInfoServersACL test (apache#6571)
33e578c
* 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 force-pushed the HBASE-28832-bootstrap-upgrade-5-branch-2.6 branch from 9973b95 to 33e578cCompare March 19, 2025 07:57

petersomogyi approved these changes Mar 24, 2025
View reviewed changes

petersomogyi merged commit 98da4a0 into apache:branch-2.6Mar 24, 2025

PDavid mentioned this pull request Mar 24, 2025
HBASE-28983 Static resources are not loaded on REST web UI pages in dev mode #6849
Merged

PDavid deleted the HBASE-28832-bootstrap-upgrade-5-branch-2.6 branch March 24, 2025 10:17

Uh oh!

Conversation

PDavid commented Dec 10, 2024

Uh oh!

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.

PDavid commented Jan 7, 2025

Uh oh!

PDavid commented Jan 8, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

PDavid commented Jan 9, 2025

Uh oh!

NihalJain commented Jan 9, 2025

Uh oh!

PDavid commented Jan 9, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

PDavid commented Mar 4, 2025

Uh oh!

NihalJain commented Mar 5, 2025

Uh oh!

Apache9 commented Mar 5, 2025

Uh oh!

NihalJain commented Mar 5, 2025

Uh oh!

Apache-HBase commented Mar 19, 2025

Uh oh!

Apache-HBase commented Mar 19, 2025

Uh oh!

Apache-HBase commented Mar 19, 2025

Uh oh!

Apache-HBase commented Mar 19, 2025

Uh oh!

petersomogyi commented Mar 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants