Merge pull request #21136 from github/mbg/java/maven-plugin-repo-chan…

Merge pull request #21136 from github/mbg/java/maven-plugin-repo-chan… #10638