removing hard dependencies on libs inheireted on geoserver main