JBTM-2077 Updated to reduce the amount of Jars marked as dependencies