Cargo and Geronimo 1.1+