Merge "Use java -jar ... instead of java -cp ..."