Merge remote-tracking branch 'asf/trunk' into trunk
diff --git a/pom.xml b/pom.xml
index 9e04b81..fe02804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>20</version>
+    <version>21</version>
     <relativePath />
   </parent>