Bumping plugins to work with Java 7