Update jar, update plugin.xml. Fix some annotations