将 javaee api 替换为 servlet api，并调整相关引用及依赖
Merge remote-tracking branch 'origin/master'