Just one more push to Java 17; from there on it should be smooth sailing. I hope you have built up a comprehensive regression test suite as part of the migration.