Update guava and commons-codec