Just so that I understand, will we need a new java_tools release after this? Or is it enough to cherry-pick this alone to 6.3.1?

I resolved the merge conflict, but we'll still need to repin the Maven stuff.

Just so that I understand, will we need a new java_tools release after this?

I believe we'll need a new java_tools release. /cc @keertk

For Bazel@6.3.1, just update the java_tools version following the old process.
For Bazel@HEAD, we'll also need a new rules_java release, then update the rules_java version in Bazel.

@cushon Can you submit a PR to cherry-pick these particular changes into release-6.3.1? The WORKSPACE file is quite different and maven_install.json doesn't exist in the release branch.

And side note, the java_tools and rules_java releases are complete. In the process of being merged to master and cherry-picked into 6.3.1.

And side note, the java_tools and rules_java releases are complete. In the process of being merged to master and cherry-picked into 6.3.1.

To double-check: were those releases done off the main branch, and are being cherry-picked into 6.3.1? I thought the only use of these jars was to bundle them into a java_tools release, so we'd only need to update them on 6.3.1 if java_tools are being build on 6.3.1. Is that the case?

Either way, 6.3.1 has already been updated to use Error Prone 2.20.0 (it was out of sync with the main branch): e0c2080. So I don't think anything else is needed there.

So to clarify, cherry-picking the new java_tools release (#19091) as per #19066 (comment) is sufficient to fix the issue reported in #19054, correct?

Yes, I double-checked that the java_tools release in #19091 contains the fix for google/error-prone#3931