Fix JDK 6 Compatibility
Restore enforcer skip option
POM update