编译时设定参数-Dservlet2时，用servlet2来编译和测试。默认采用servlet3。

xiaomM · Oct 23, 2012 · cb90537 · cb90537
1 parent 6713e3a
commit cb90537
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 85 deletions.
diff --git a/common/logconfig/pom.xml b/common/logconfig/pom.xml
@@ -30,10 +30,6 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/common/springext/pom.xml b/common/springext/pom.xml
@@ -15,10 +15,6 @@
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-common-generictype</artifactId>

diff --git a/common/util/pom.xml b/common/util/pom.xml
@@ -20,10 +20,6 @@
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>

diff --git a/dist/test/pom.xml b/dist/test/pom.xml
@@ -129,11 +129,6 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>httpunit</groupId>
             <artifactId>httpunit</artifactId>

diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml
@@ -204,10 +204,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-webx-dev</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -62,6 +62,54 @@
                 <gpg.skip>false</gpg.skip>
             </properties>
         </profile>
+        <profile>
+            <id>servlet2</id>
+            <activation>
+                <property>
+                    <name>servlet2</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </dependency>
+            </dependencies>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                        <version>2.5</version>
+                        <scope>provided</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+        <profile>
+            <id>servlet3</id>
+            <activation>
+                <property>
+                    <name>!servlet2</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </dependency>
+            </dependencies>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>javax.servlet-api</artifactId>
+                        <version>3.0.1</version>
+                        <scope>provided</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
     <modules>
         <module>dist/webx</module>
@@ -462,12 +510,6 @@
                 <artifactId>cglib-nodep</artifactId>
                 <version>2.2.2</version>
             </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.0.1</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>javax.mail</groupId>
                 <artifactId>mail</artifactId>

diff --git a/service/dataresolver/pom.xml b/service/dataresolver/pom.xml
@@ -24,10 +24,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/service/form/pom.xml b/service/form/pom.xml
@@ -11,10 +11,6 @@
     <artifactId>citrus-service-form</artifactId>
     <name>Citrus Form Service</name>
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>ecs</groupId>
             <artifactId>ecs</artifactId>

diff --git a/service/jsp/pom.xml b/service/jsp/pom.xml
@@ -32,10 +32,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>jasper</artifactId>

diff --git a/service/moduleloader/pom.xml b/service/moduleloader/pom.xml
@@ -36,9 +36,5 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/service/pipeline/pom.xml b/service/pipeline/pom.xml
@@ -23,9 +23,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-common-expr</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/service/pull/pom.xml b/service/pull/pom.xml
@@ -24,9 +24,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/service/requestcontext/pom.xml b/service/requestcontext/pom.xml
@@ -11,10 +11,6 @@
     <artifactId>citrus-service-requestcontext</artifactId>
     <name>Citrus Request Context Service</name>
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

diff --git a/service/resource/pom.xml b/service/resource/pom.xml
@@ -24,9 +24,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/service/upload/pom.xml b/service/upload/pom.xml
@@ -20,10 +20,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>

diff --git a/service/uribroker/pom.xml b/service/uribroker/pom.xml
@@ -41,10 +41,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-service-requestcontext</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-service-configuration</artifactId>

diff --git a/test/util/pom.xml b/test/util/pom.xml
@@ -30,11 +30,6 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>httpunit</groupId>
             <artifactId>httpunit</artifactId>

diff --git a/webx/dev/pom.xml b/webx/dev/pom.xml
@@ -11,10 +11,6 @@
     <artifactId>citrus-webx-dev</artifactId>
     <name>Development mode tools for Webx</name>
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-webx-turbine</artifactId>

diff --git a/webx/framework/pom.xml b/webx/framework/pom.xml
@@ -12,10 +12,6 @@
     <artifactId>citrus-webx-framework</artifactId>
     <name>Citrus Webx Framework</name>
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-service-resource</artifactId>

diff --git a/webx/turbine/pom.xml b/webx/turbine/pom.xml
@@ -12,10 +12,6 @@
     <artifactId>citrus-webx-turbine</artifactId>
     <name>Citrus Webx Turbine-style Implementation</name>
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>