CXF upgrade