Merge branch 'master' of https://github.com/mybatis/mybatis-3.git

emacarron · emacarron · commit 6b60097cb785 · 2014-03-29T23:11:49.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -274,6 +274,7 @@
                   <pattern>org.apache.ibatis.**</pattern>
                 </keep>
               </rules>
+              <overwrite>true</overwrite>
             </configuration>
           </execution>
         </executions>
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -15,9 +15,8 @@
   limitations under the License.
 -->
 <!-- version: $Id$ -->
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
-  name="MyBatis">
+<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
 
   <body>
     <menu name="Reference Documentation">
