Revert "Java 5 stuff"

o This change broke the ITs on 2.2.1

Conflicts:
	src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1480542 13f79535-47bb-0310-9956-ffa450edef68