Adam Cozzette 673971834c Merge branch 'master' into 3.15.x %!s(int64=4) %!d(string=hai) anos
..
src f645c7ed07 Fixed spelling errors surfaced by CodeSpell. %!s(int64=4) %!d(string=hai) anos
BUILD 6bbd56dfd9 Bazel: Discontinue JDK 7 compatibility support %!s(int64=5) %!d(string=hai) anos
generate-sources-build.xml 49efe9d7db Restructuring protobuf to multiple modules %!s(int64=10) %!d(string=hai) anos
generate-test-sources-build.xml cb390216cf Fixed the Java build. %!s(int64=5) %!d(string=hai) anos
pom.xml 4fff47a418 Update protobuf version %!s(int64=4) %!d(string=hai) anos