Workaround to avoid devkit 3.5.0-RC dependency and fix com.sun.codemodel dependency