From a07a83d48ba31772238d1ea9db6213a9005e8915 Mon Sep 17 00:00:00 2001
From: Tommy Wang <tommy@gaixie.org>
Date: Wed, 20 Oct 2010 13:45:54 +0800
Subject: [PATCH] =?utf8?q?=E6=8C=87=E5=AE=9Amaven=E6=8F=92=E4=BB=B6?=
 =?utf8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BB=A5=E6=94=AF=E6=8C=81maven=203.?=
 =?utf8?q?0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 assemblies/jibu/pom.xml                                | 2 +-
 assemblies/jibu/src/main/assembly/{app.xml => bin.xml} | 1 +
 assemblies/pom.xml                                     | 1 +
 itest/war-itest-suite/pom.xml                          | 4 +++-
 jibu-web/pom.xml                                       | 1 +
 pom.xml                                                | 4 ++++
 6 files changed, 11 insertions(+), 2 deletions(-)
 rename assemblies/jibu/src/main/assembly/{app.xml => bin.xml} (98%)

diff --git a/assemblies/jibu/pom.xml b/assemblies/jibu/pom.xml
index f20997f..053761e 100644
--- a/assemblies/jibu/pom.xml
+++ b/assemblies/jibu/pom.xml
@@ -43,7 +43,7 @@
         </executions>
         <configuration>
           <descriptors>
-            <descriptor>src/main/assembly/app.xml</descriptor>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
             <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/assemblies/jibu/src/main/assembly/app.xml b/assemblies/jibu/src/main/assembly/bin.xml
similarity index 98%
rename from assemblies/jibu/src/main/assembly/app.xml
rename to assemblies/jibu/src/main/assembly/bin.xml
index a0f4002..e1f8232 100644
--- a/assemblies/jibu/src/main/assembly/app.xml
+++ b/assemblies/jibu/src/main/assembly/bin.xml
@@ -15,6 +15,7 @@
    limitations under the License.
   --> 
 <assembly>
+  <id>bin</id>
   <formats>
     <format>war</format>
   </formats>
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index 8841f13..e1dcd0c 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -38,6 +38,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/itest/war-itest-suite/pom.xml b/itest/war-itest-suite/pom.xml
index 10d6c84..828a87e 100644
--- a/itest/war-itest-suite/pom.xml
+++ b/itest/war-itest-suite/pom.xml
@@ -34,16 +34,18 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.5</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
         <configuration>
           <encoding>utf-8</encoding>
           <systemPropertyVariables>
-            <warPath>../../assemblies/jibu/target/jibu-${project.version}.war</warPath>
+            <warPath>../../assemblies/jibu/target/jibu-${project.version}-bin.war</warPath>
           </systemPropertyVariables>
         </configuration>
         <executions>
diff --git a/jibu-web/pom.xml b/jibu-web/pom.xml
index a65daee..b694e8c 100644
--- a/jibu-web/pom.xml
+++ b/jibu-web/pom.xml
@@ -38,6 +38,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
+          <version>2.1</version>
         </plugin>
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
diff --git a/pom.xml b/pom.xml
index 41b7213..e0eccbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
           <configuration>
             <!--  DBCP 1.4 compiles and runs under JDK 1.6 only (JDBC 4) -->
             <source>1.6</source>
@@ -87,14 +88,17 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
+          <version>2.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.7</version>
           <configuration>
             <links>
               <link>http://download.oracle.com/javase/6/docs/api/</link>
-- 
2.11.4.GIT