Merge pull request #2361 from apache/dependabot/maven/maven-patch-group-8629ce9c59