Update to 1.7.  Use jar packaging