Upgrade to Java plugins 2.1