Master Sync 02-07-2024

Open Pandrex247 opened this issue 1 year ago • 2 comments

Description

Syncs applicable changes from the master branch.

Important Info

Blockers

None

Testing

New tests

None

Testing Performed

Built the server and started the admin console

Testing Environment

Windows 11, Zulu 21.0.3

Documentation

N/A

Notes for Reviewers

None

Jun 19 '24 15:06 Pandrex247

Merge conflicts

Jun 24 '24 14:06 kalinchan

The new awaitility version introduced in https://github.com/payara/Payara/pull/6756 seems to not like the specific Java version used on Jenkins.

java.lang.NumberFormatException: For input string: "21-ea"
	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:67)
	at java.base/java.lang.Integer.parseInt(Integer.java:661)
	at java.base/java.lang.Integer.parseInt(Integer.java:777)
	at org.awaitility.core.JavaVersionDetector.getJavaMajorVersion(JavaVersionDetector.java:21)

Jul 03 '24 13:07 Pandrex247