Update for java skeleton and javadoc plugin