Merge pull request #12 from apache/dependabot/maven/master/org.apache-apache-25

Bump apache from 21 to 25