Log Message:
Update maven to 3.0.4.

Too many changes since 2.2.1.

Apache Maven 3.0.4 should be backwards compatibility with 2.x. For
compatibility issues, see

https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html