Upgrade/geotools 8