(cherry picked from commit 82c55dcbc8e3d5314aae9f8f600c660759213e45) (cherry picked from commit 25df276c6b24db46070c9885e48e363cc92d1b6f) Conflicts: hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
(cherry picked from commit 82c55dcbc8e3d5314aae9f8f600c660759213e45) (cherry picked from commit 25df276c6b24db46070c9885e48e363cc92d1b6f) Conflicts: hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java