From bd33b44645f4b6269619106739231b423c3d3839 Mon Sep 17 00:00:00 2001
From: Michael Zhou <yizhi@taobao.com>
Date: Sun, 24 Jun 2012 23:59:26 -0600
Subject: [PATCH] Upgraded webx version from 3.1.0 to 3.1.1

---
 CHANGES.txt                    | 4 ++++
 common/expr/pom.xml            | 2 +-
 common/generictype/pom.xml     | 2 +-
 common/hessian/pom.xml         | 2 +-
 common/logconfig/pom.xml       | 2 +-
 common/springext/pom.xml       | 2 +-
 common/util/pom.xml            | 2 +-
 dist/test/pom.xml              | 2 +-
 dist/webx/pom.xml              | 2 +-
 pom.xml                        | 4 ++--
 service/base/pom.xml           | 2 +-
 service/configuration/pom.xml  | 2 +-
 service/dataresolver/pom.xml   | 2 +-
 service/form/pom.xml           | 2 +-
 service/freemarker/pom.xml     | 2 +-
 service/jsp/pom.xml            | 2 +-
 service/mail/pom.xml           | 2 +-
 service/mappingrule/pom.xml    | 2 +-
 service/moduleloader/pom.xml   | 2 +-
 service/pipeline/pom.xml       | 2 +-
 service/pull/pom.xml           | 2 +-
 service/requestcontext/pom.xml | 2 +-
 service/resource/pom.xml       | 2 +-
 service/template/pom.xml       | 2 +-
 service/upload/pom.xml         | 2 +-
 service/uribroker/pom.xml      | 2 +-
 service/velocity/pom.xml       | 2 +-
 test/util/pom.xml              | 2 +-
 test/webx/pom.xml              | 2 +-
 webx/dev/pom.xml               | 2 +-
 webx/framework/pom.xml         | 2 +-
 webx/turbine/pom.xml           | 2 +-
 32 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3b72642e4..8f5bae081 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -265,6 +265,8 @@
         </handleException>
     </services:pipeline>
 
+-- Changes in 3.0.9
+
 -- Changes in 3.1.0
 
 * 升级到spring 3.1.1
@@ -276,3 +278,5 @@
 
 * 增加检测代码，以防止webx3.1.x和spring 3.1.1之前的版本一起使用。
 
+-- Changes in 3.1.1
+
diff --git a/common/expr/pom.xml b/common/expr/pom.xml
index 5fd2acade..c5e159b85 100644
--- a/common/expr/pom.xml
+++ b/common/expr/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/generictype/pom.xml b/common/generictype/pom.xml
index f2be29e91..3838c985a 100644
--- a/common/generictype/pom.xml
+++ b/common/generictype/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/hessian/pom.xml b/common/hessian/pom.xml
index 0a6185a34..53d53b7e5 100644
--- a/common/hessian/pom.xml
+++ b/common/hessian/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/logconfig/pom.xml b/common/logconfig/pom.xml
index 0e2bb2b9f..e63425a86 100644
--- a/common/logconfig/pom.xml
+++ b/common/logconfig/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/springext/pom.xml b/common/springext/pom.xml
index ff9d9a75b..92161f576 100644
--- a/common/springext/pom.xml
+++ b/common/springext/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/util/pom.xml b/common/util/pom.xml
index a8eeb285b..ce9747dbb 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dist/test/pom.xml b/dist/test/pom.xml
index e207763a5..18aab9c73 100644
--- a/dist/test/pom.xml
+++ b/dist/test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml
index b789b05c5..b9c46215d 100644
--- a/dist/webx/pom.xml
+++ b/dist/webx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 80051575c..f2b115c65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <artifactId>citrus-parent</artifactId>
     <packaging>pom</packaging>
     <name>Citrus Parent Project</name>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <description>Another Java-based WEB Framework</description>
     <url>http://www.openwebx.org/</url>
     <licenses>
@@ -44,7 +44,7 @@
     <properties>
         <java.version>1.6</java.version>
         <java.encoding>UTF-8</java.encoding>
-        <webx-version>3.1.0</webx-version>
+        <webx-version>3.1.1</webx-version>
         <spring-version>3.1.1.RELEASE</spring-version>
         <springext-plugin-version>1.0</springext-plugin-version>
         <maven-util-version>1.0</maven-util-version>
diff --git a/service/base/pom.xml b/service/base/pom.xml
index 2c092f4bf..0c457155b 100644
--- a/service/base/pom.xml
+++ b/service/base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/configuration/pom.xml b/service/configuration/pom.xml
index 72fcd6006..1d44f4141 100644
--- a/service/configuration/pom.xml
+++ b/service/configuration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/dataresolver/pom.xml b/service/dataresolver/pom.xml
index 6ec04b4a0..b1a86850d 100644
--- a/service/dataresolver/pom.xml
+++ b/service/dataresolver/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/form/pom.xml b/service/form/pom.xml
index 2152e41b1..63a2cdf45 100644
--- a/service/form/pom.xml
+++ b/service/form/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/freemarker/pom.xml b/service/freemarker/pom.xml
index 275bdb505..82a5608b2 100644
--- a/service/freemarker/pom.xml
+++ b/service/freemarker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/jsp/pom.xml b/service/jsp/pom.xml
index c339a6683..d159940d9 100644
--- a/service/jsp/pom.xml
+++ b/service/jsp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/mail/pom.xml b/service/mail/pom.xml
index 8fb688222..ddf428e28 100644
--- a/service/mail/pom.xml
+++ b/service/mail/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/mappingrule/pom.xml b/service/mappingrule/pom.xml
index 4b82e004f..8b0ce1bc5 100644
--- a/service/mappingrule/pom.xml
+++ b/service/mappingrule/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/moduleloader/pom.xml b/service/moduleloader/pom.xml
index 93a0dbb74..21b489bee 100644
--- a/service/moduleloader/pom.xml
+++ b/service/moduleloader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/pipeline/pom.xml b/service/pipeline/pom.xml
index f8a1a00d1..486903dd6 100644
--- a/service/pipeline/pom.xml
+++ b/service/pipeline/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/pull/pom.xml b/service/pull/pom.xml
index 3c7918e5f..c9818f3df 100644
--- a/service/pull/pom.xml
+++ b/service/pull/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/requestcontext/pom.xml b/service/requestcontext/pom.xml
index aee590ccc..8fbacee8f 100644
--- a/service/requestcontext/pom.xml
+++ b/service/requestcontext/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/resource/pom.xml b/service/resource/pom.xml
index 4af4af04c..f98f6b3da 100644
--- a/service/resource/pom.xml
+++ b/service/resource/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/template/pom.xml b/service/template/pom.xml
index d30e47540..5cfe18be4 100644
--- a/service/template/pom.xml
+++ b/service/template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/upload/pom.xml b/service/upload/pom.xml
index 6636afa7c..fc200db8d 100644
--- a/service/upload/pom.xml
+++ b/service/upload/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/uribroker/pom.xml b/service/uribroker/pom.xml
index 11a77299e..94d919ec2 100644
--- a/service/uribroker/pom.xml
+++ b/service/uribroker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/service/velocity/pom.xml b/service/velocity/pom.xml
index c16c16c45..3c67de109 100644
--- a/service/velocity/pom.xml
+++ b/service/velocity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/util/pom.xml b/test/util/pom.xml
index 534701efe..69d146709 100644
--- a/test/util/pom.xml
+++ b/test/util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/webx/pom.xml b/test/webx/pom.xml
index f7631180d..25d119137 100644
--- a/test/webx/pom.xml
+++ b/test/webx/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/webx/dev/pom.xml b/webx/dev/pom.xml
index 9b8fa58f6..bf69d6fd0 100644
--- a/webx/dev/pom.xml
+++ b/webx/dev/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/webx/framework/pom.xml b/webx/framework/pom.xml
index b2b3e8f0a..e881866fe 100644
--- a/webx/framework/pom.xml
+++ b/webx/framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/webx/turbine/pom.xml b/webx/turbine/pom.xml
index 136da01f9..2801079d9 100644
--- a/webx/turbine/pom.xml
+++ b/webx/turbine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>citrus-parent</artifactId>
         <groupId>com.alibaba.citrus</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>