* 升级servlet api到3.0.1。

webx · Oct 22, 2012 · 09db838 · 09db838
1 parent 456cd35
commit 09db838
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 21 deletions.
diff --git 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空值的时候，<all-of-values>验证器不能正确取得null值，导致验证结果错误。
+* 升级servlet api到3.0.1。
diff --git a/common/logconfig/pom.xml b/common/logconfig/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/common/springext/pom.xml b/common/springext/pom.xml
@@ -17,7 +17,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/common/util/pom.xml b/common/util/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/dist/test/pom.xml b/dist/test/pom.xml
@@ -131,7 +131,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml
@@ -206,7 +206,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>

diff --git a/pom.xml b/pom.xml
@@ -460,8 +460,8 @@
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.0.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>

diff --git a/service/dataresolver/pom.xml b/service/dataresolver/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/service/form/pom.xml b/service/form/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>ecs</groupId>

diff --git a/service/jsp/pom.xml b/service/jsp/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>

diff --git a/service/moduleloader/pom.xml b/service/moduleloader/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/service/pipeline/pom.xml b/service/pipeline/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/service/pull/pom.xml b/service/pull/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/service/requestcontext/pom.xml b/service/requestcontext/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>

diff --git a/service/resource/pom.xml b/service/resource/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/service/upload/pom.xml b/service/upload/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>

diff --git a/service/uribroker/pom.xml b/service/uribroker/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/test/util/pom.xml b/test/util/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/webx/dev/pom.xml b/webx/dev/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/webx/framework/pom.xml b/webx/framework/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/webx/turbine/pom.xml b/webx/turbine/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,3 +63,4 @@
		-- Changes in 3.1.2

		* Bugfix: 多值field中存在null空值的时候，<all-of-values>验证器不能正确取得null值，导致验证结果错误。
		* 升级servlet api到3.0.1。