untagged-9ceaa032c90fcdc6db20: Attempt 2 of fixes
Had to update JDK to use OpenJDK instead because of stupid Oracle reasons, now we have to hopefully just change branches
Had to update JDK to use OpenJDK instead because of stupid Oracle reasons, now we have to hopefully just change branches