Merged granite-client and granite-java-client jars/source jars