From 5d0640f87f76c95ce4e52446a5d4415d0aaa5ed6 Mon Sep 17 00:00:00 2001
From: Michael Zhou <yizhi@taobao.com>
Date: Wed, 23 Jan 2013 15:49:42 -0600
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=8F=91=E5=B8=83=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DEPLOY.txt             |  7 +++----
 dist/springext/pom.xml |  5 +----
 dist/test/pom.xml      |  5 +----
 dist/webx/pom.xml      |  5 +----
 pom.xml                | 13 ++++---------
 5 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/DEPLOY.txt b/DEPLOY.txt
index c70119eb1..b3740f42f 100644
--- a/DEPLOY.txt
+++ b/DEPLOY.txt
@@ -116,16 +116,15 @@ Sonatype OSS Staging 库管理：   https://oss.sonatype.org/
 
 1. 确保所有源代码提交
 2. checkout要发布的分支，例如：git checkout dev-3.0.8
-3. 分别发布parent和dist目录下的项目：
+3. 分别项目：
 
 cd citrus
-mvn clean deploy -N -Pdeployment -Ddeployment.skip=false
-
 mvn clean deploy -Pdeployment
 
 确保使用deployment profile，以便生成sonatype所需要的数字签名。
+并非所有子项目都会被发布，只有那些 maven-deploy-plugin.skip=false 的项目才会被发布。
 
-4. 如果还需要发布其余的分支，切换到该分支，并重作2-4
+4. 如果还需要发布其余的分支，切换到该分支，并重作2-3
 5. 在应用中测试staging库，用sonatype profile，例如在应用的目录下执行：mvn jetty:run -Psonatype
 6. 在sonatype管理界面中promote项目到central maven repository
 7. 对发布版本创建tags
diff --git a/dist/springext/pom.xml b/dist/springext/pom.xml
index 7054cee4e..ce6548059 100644
--- a/dist/springext/pom.xml
+++ b/dist/springext/pom.xml
@@ -11,15 +11,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>citrus-springext-all</artifactId>
     <name>SpringExt All-in-one Bundle</name>
-    <properties>
-        <!-- 发布此项目 -->
-        <deployment.skip>false</deployment.skip>
-    </properties>
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
+                    <!-- 发布此项目 -->
                     <skip>false</skip>
                 </configuration>
             </plugin>
diff --git a/dist/test/pom.xml b/dist/test/pom.xml
index f22686574..df1057283 100644
--- a/dist/test/pom.xml
+++ b/dist/test/pom.xml
@@ -11,15 +11,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>citrus-test-all</artifactId>
     <name>Test Utils for Webx</name>
-    <properties>
-        <!-- 发布此项目 -->
-        <deployment.skip>false</deployment.skip>
-    </properties>
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
+                    <!-- 发布此项目 -->
                     <skip>false</skip>
                 </configuration>
             </plugin>
diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml
index 40d283c34..94a17dc07 100644
--- a/dist/webx/pom.xml
+++ b/dist/webx/pom.xml
@@ -11,15 +11,12 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>citrus-webx-all</artifactId>
     <name>Webx All-in-one Bundle</name>
-    <properties>
-        <!-- 发布此项目 -->
-        <deployment.skip>false</deployment.skip>
-    </properties>
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
+                    <!-- 发布此项目 -->
                     <skip>false</skip>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index 5b2294279..85edee4a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@
         <maven-util-version>1.1</maven-util-version>
         <jetty-version>8.1.7.v20120910</jetty-version>
         <project.build.sourceEncoding>${java.encoding}</project.build.sourceEncoding>
-        <deployment.skip>true</deployment.skip>
         <gpg.skip>true</gpg.skip>
     </properties>
     <profiles>
@@ -587,13 +586,6 @@
     </dependencyManagement>
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -695,8 +687,10 @@
             </plugin>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
+                <inherited>false</inherited>
                 <configuration>
-                    <skip>${deployment.skip}</skip>
+                    <!-- 发布parent项目 -->
+                    <skip>false</skip>
                 </configuration>
             </plugin>
             <plugin>
@@ -731,6 +725,7 @@
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.7</version>
                     <configuration>
+                        <!-- 默认不发布 -->
                         <skip>true</skip>
                     </configuration>
                 </plugin>