Fix main javadoc task
Next dev iteration
Upgrade deps