diff --git a/CHANGES_SINCE_3.1.0.txt b/CHANGES_SINCE_3.1.0.txt index 336735f54..5d1faeab8 100644 --- a/CHANGES_SINCE_3.1.0.txt +++ b/CHANGES_SINCE_3.1.0.txt @@ -63,3 +63,4 @@ -- Changes in 3.1.2 * Bugfix: 多值field中存在null空值的时候,验证器不能正确取得null值,导致验证结果错误。 +* 升级servlet api到3.0.1。 diff --git a/common/logconfig/pom.xml b/common/logconfig/pom.xml index da209b310..75c5c4e3b 100644 --- a/common/logconfig/pom.xml +++ b/common/logconfig/pom.xml @@ -32,7 +32,7 @@ javax.servlet - servlet-api + javax.servlet-api junit diff --git a/common/springext/pom.xml b/common/springext/pom.xml index 953ebff4d..5f00cfd9a 100644 --- a/common/springext/pom.xml +++ b/common/springext/pom.xml @@ -17,7 +17,7 @@ javax.servlet - servlet-api + javax.servlet-api ${project.groupId} diff --git a/common/util/pom.xml b/common/util/pom.xml index 764703842..6081f9377 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -22,7 +22,7 @@ javax.servlet - servlet-api + javax.servlet-api ${project.groupId} diff --git a/dist/test/pom.xml b/dist/test/pom.xml index 8b1d8d568..58b113913 100644 --- a/dist/test/pom.xml +++ b/dist/test/pom.xml @@ -131,7 +131,7 @@ javax.servlet - servlet-api + javax.servlet-api compile diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml index 75364f6fb..808a14340 100644 --- a/dist/webx/pom.xml +++ b/dist/webx/pom.xml @@ -206,7 +206,7 @@ javax.servlet - servlet-api + javax.servlet-api javax.mail diff --git a/pom.xml b/pom.xml index d97dfbe4e..474d78267 100644 --- a/pom.xml +++ b/pom.xml @@ -460,8 +460,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + 3.0.1 provided diff --git a/service/dataresolver/pom.xml b/service/dataresolver/pom.xml index e36d87f2a..5a37324fe 100644 --- a/service/dataresolver/pom.xml +++ b/service/dataresolver/pom.xml @@ -26,7 +26,7 @@ javax.servlet - servlet-api + javax.servlet-api test diff --git a/service/form/pom.xml b/service/form/pom.xml index 290e28b75..16ddaaf21 100644 --- a/service/form/pom.xml +++ b/service/form/pom.xml @@ -13,7 +13,7 @@ javax.servlet - servlet-api + javax.servlet-api ecs diff --git a/service/jsp/pom.xml b/service/jsp/pom.xml index 35f19bb95..fdfa0b111 100644 --- a/service/jsp/pom.xml +++ b/service/jsp/pom.xml @@ -34,7 +34,7 @@ javax.servlet - servlet-api + javax.servlet-api org.apache.tomcat diff --git a/service/moduleloader/pom.xml b/service/moduleloader/pom.xml index f1c19fb9c..9cae7ba9a 100644 --- a/service/moduleloader/pom.xml +++ b/service/moduleloader/pom.xml @@ -38,7 +38,7 @@ javax.servlet - servlet-api + javax.servlet-api diff --git a/service/pipeline/pom.xml b/service/pipeline/pom.xml index 127614c03..8658e6575 100644 --- a/service/pipeline/pom.xml +++ b/service/pipeline/pom.xml @@ -25,7 +25,7 @@ javax.servlet - servlet-api + javax.servlet-api diff --git a/service/pull/pom.xml b/service/pull/pom.xml index 159bde31c..6c03511c8 100644 --- a/service/pull/pom.xml +++ b/service/pull/pom.xml @@ -26,7 +26,7 @@ javax.servlet - servlet-api + javax.servlet-api diff --git a/service/requestcontext/pom.xml b/service/requestcontext/pom.xml index 29449c25f..21aeb85f8 100644 --- a/service/requestcontext/pom.xml +++ b/service/requestcontext/pom.xml @@ -13,7 +13,7 @@ javax.servlet - servlet-api + javax.servlet-api commons-codec diff --git a/service/resource/pom.xml b/service/resource/pom.xml index 7eebfae74..3ecce619b 100644 --- a/service/resource/pom.xml +++ b/service/resource/pom.xml @@ -26,7 +26,7 @@ javax.servlet - servlet-api + javax.servlet-api diff --git a/service/upload/pom.xml b/service/upload/pom.xml index fd71cff01..6fbeb0c6d 100644 --- a/service/upload/pom.xml +++ b/service/upload/pom.xml @@ -22,7 +22,7 @@ javax.servlet - servlet-api + javax.servlet-api commons-fileupload diff --git a/service/uribroker/pom.xml b/service/uribroker/pom.xml index 2bd835e13..bed1889a2 100644 --- a/service/uribroker/pom.xml +++ b/service/uribroker/pom.xml @@ -43,7 +43,7 @@ javax.servlet - servlet-api + javax.servlet-api ${project.groupId} diff --git a/test/util/pom.xml b/test/util/pom.xml index 9e836269e..4fd6ecaab 100644 --- a/test/util/pom.xml +++ b/test/util/pom.xml @@ -32,7 +32,7 @@ javax.servlet - servlet-api + javax.servlet-api compile diff --git a/webx/dev/pom.xml b/webx/dev/pom.xml index 2d57c4f2e..6f79c2313 100644 --- a/webx/dev/pom.xml +++ b/webx/dev/pom.xml @@ -13,7 +13,7 @@ javax.servlet - servlet-api + javax.servlet-api ${project.groupId} diff --git a/webx/framework/pom.xml b/webx/framework/pom.xml index 8ffce21fb..31c43fb9c 100644 --- a/webx/framework/pom.xml +++ b/webx/framework/pom.xml @@ -14,7 +14,7 @@ javax.servlet - servlet-api + javax.servlet-api ${project.groupId} diff --git a/webx/turbine/pom.xml b/webx/turbine/pom.xml index bc409a823..0bae010c4 100644 --- a/webx/turbine/pom.xml +++ b/webx/turbine/pom.xml @@ -14,7 +14,7 @@ javax.servlet - servlet-api + javax.servlet-api com.alibaba