Upgrade netty and xstream