[MPOM-107] Upgrade to ASF Parent 18

Intermediate update to 18-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/maven/pom/trunk@1739501 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven/pom.xml b/maven/pom.xml
index da169da..15431e1 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>17</version>
+    <version>18-SNAPSHOT</version>
     <relativePath>../asf/pom.xml</relativePath>
   </parent>
 
@@ -902,23 +902,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-	  <version>3.5</version>
+          <version>3.5.1</version>
           <configuration>
             <!-- for multi-modules site staging -->
             <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</topSiteURL>
           </configuration>
-          <dependencies>
-            <dependency><!-- TODO remove when upgrading parent pom to version 18 -->
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-core</artifactId>
-              <version>1.7</version>
-            </dependency>
-            <dependency><!-- TODO remove when upgrading fluido skin to 1.5 -->
-              <groupId>org.apache.velocity</groupId>
-              <artifactId>velocity</artifactId>
-              <version>1.5</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1287,7 +1275,7 @@
                 <link>http://commons.apache.org/proper/commons-collections/javadocs/api-release</link>
                 <link>http://junit.org/javadoc/4.10/</link>
                 <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
-                <link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/</link>
+                <link>http://velocity.apache.org/engine/releases/velocity-1.7/apidocs/</link>
               </links>
               <detectLinks>true</detectLinks>
               <tagletArtifacts>