jdom2 upgrade

Upgrade to jdom2 to fix threading issue with jdom1.