Use apache lang 3.1 instead of lang 2.2 + 3.0