diff -Nru mojarra-2.2.13/common/ant/common.xml mojarra-2.2.13.maven-ant-tasks/common/ant/common.xml
--- mojarra-2.2.13/common/ant/common.xml	2016-09-29 08:39:15.720999801 +0200
+++ mojarra-2.2.13.maven-ant-tasks/common/ant/common.xml	2016-09-29 08:38:11.810135385 +0200
@@ -41,7 +41,7 @@
 
 -->
 
-<project name="JSF Common" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="JSF Common" basedir=".">
 
     <import file="${jsf.build.home}/common/ant/dependencies.xml"/>
     <import file="${jsf.build.home}/common/ant/test-app.xml"/>
@@ -59,12 +59,6 @@
         </classpath>
     </taskdef>
 
-    <path id="maven-ant-tasks.classpath" path="${jsf.build.home}/common/lib/maven-ant-tasks-2.1.3.jar" />
-      <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-               uri="antlib:org.apache.maven.artifact.ant"
-               classpathref="maven-ant-tasks.classpath" />
-
-    
     <!-- Setup the time properties for use with the project -->
     <tstamp/>
     
@@ -123,93 +117,6 @@
     <!-- Debug args (OVERRIDE IN BUILD.PROPERTIES) -->
     <property name="debug.jvm.args" value=""/>
 
-    <!--  TODO remove this once maven stuff is complete, it's just here for reference.
-
-    <target name="mvn-init" unless="compile.classpath" xmlns:artifact="urn:maven-artifact-ant">
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
-            classpath="lib/maven-ant-tasks-2.0.9.jar"/>
-        <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository">
-            <isset property="maven.repo.local"/>
-        </condition>
-        <echo>maven.repo.local=${maven.repo.local}</echo>
-        <artifact:localRepository id="local.repository" path="${maven.repo.local}"/>
-        <artifact:pom file="pom.xml" id="maven.project"/>
-        <artifact:dependencies pathId="compile.classpath" filesetId="compile.fileset" useScope="compile">
-            <pom refid="maven.project"/>
-            <localRepository refid="local.repository"/>
-        </artifact:dependencies>
-        <artifact:dependencies pathId="test.classpath" filesetId="test.fileset" useScope="test">
-            <pom refid="maven.project"/>
-            <localRepository refid="local.repository"/>
-        </artifact:dependencies>
-        <artifact:dependencies pathId="runtime.classpath" filesetId="runtime.fileset" useScope="runtime">
-            <pom refid="maven.project"/>
-            <localRepository refid="local.repository"/>
-        </artifact:dependencies>
-    </target>
-
-    -->
-    <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository">
-        <isset property="maven.repo.local"/>
-    </condition>
-
-    <artifact:localRepository id="local.repository" path="${maven.repo.local}"/>
-    
-    <artifact:remoteRepository id="j.n.repo" url="https://maven.java.net/content/repositories/releases/"/>
-    <artifact:remoteRepository id="j.n.repo.snapshot" url="https://maven.java.net/content/repositories/snapshots/"/>
-    <artifact:remoteRepository id="ibiblio.repo" url="http://mirrors.ibiblio.org/pub/mirrors/maven2/"/>
-
-    <artifact:dependencies filesetId="compile.filepath" pathId="compile.path">
-        <dependency groupId="javax.el" artifactId="javax.el-api" version="2.2.1" scope="provided"/>
-        <dependency groupId="javax.servlet" artifactId="javax.servlet-api" version="3.0.1" scope="provided"/>
-        <dependency groupId="javax.servlet.jsp" artifactId="javax.servlet.jsp-api" version="2.2.1" scope="provided"/>
-        <dependency groupId="javax.annotation" artifactId="jsr250-api" version="1.0" scope="provided"/>
-        <dependency groupId="org.codehaus.groovy" artifactId="groovy-all" version="1.6.9" scope="provided"/>
-        <dependency groupId="javax.validation" artifactId="validation-api" version="1.0.0.GA" scope="provided"/>
-        <dependency groupId="javax.inject" artifactId="javax.inject" version="1" scope="provided"/>
-        <dependency groupId="javax.servlet.jsp.jstl" artifactId="jstl-api" version="1.2" scope="provided" />
-        <dependency groupId="javax" artifactId="javaee-web-api" version="6.0" scope="provided"/>
-        <dependency groupId="com.sun.el" artifactId="el-ri" version="1.0" scope="provided"/>
-        <localRepository refid="local.repository"/>
-        <remoteRepository refid="j.n.repo"/>
-        <remoteRepository refid="j.n.repo.snapshot"/>
-    </artifact:dependencies>
-
-    <artifact:dependencies filesetId="cdi.filepath" pathId="cdi.path">
-        <dependency groupId="javax.enterprise" artifactId="cdi-api" version="1.1" scope="provided"/>
-        <localRepository refid="local.repository"/>
-        <remoteRepository refid="ibiblio.repo"/>
-    </artifact:dependencies>
-    
-    <artifact:dependencies filesetId="jsf-spi.filepath" pathId="jsf-spi.path">
-        <dependency groupId="com.sun.faces" artifactId="jsf-spi" version="1.0" scope="provided"/>
-        <localRepository refid="local.repository"/>
-        <remoteRepository refid="j.n.repo"/>
-        <remoteRepository refid="j.n.repo.snapshot"/>
-    </artifact:dependencies>
-    
-    <artifact:dependencies filesetId="commons.filepath" pathId="commons.path">
-        <dependency groupId="commons-collections" artifactId="commons-collections" version="2.1.1"/>
-        <dependency groupId="commons-digester" artifactId="commons-digester" version="1.5"/>
-        <dependency groupId="commons-beanutils" artifactId="commons-beanutils" version="1.6.1"/>
-        <dependency groupId="commons-logging" artifactId="commons-logging" version="1.0.4"/>
-        <localRepository refid="local.repository"/>
-        <remoteRepository refid="j.n.repo"/>
-        <remoteRepository refid="j.n.repo.snapshot"/>
-    </artifact:dependencies>
-
-    <artifact:dependencies filesetId="servlet25test.filepath" pathId="servlet25test.path">
-        <dependency groupId="javax.el" artifactId="el-api" version="1.0" scope="provided"/>
-        <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.5"/>
-        <dependency groupId="javax.servlet.jsp" artifactId="jsp-api" version="2.1" scope="provided"/>
-        <dependency groupId="javax.servlet.jsp.jstl" artifactId="jstl-api" version="1.2" scope="provided"/>
-        <dependency groupId="javax.annotation" artifactId="jsr250-api" version="1.0" scope="provided"/>
-        <localRepository refid="local.repository"/>
-        <remoteRepository refid="j.n.repo"/>
-        <remoteRepository refid="j.n.repo.snapshot"/>
-    </artifact:dependencies>
-
-
     <!-- Intra-project dependency property names -->
 
     <!-- this is hard coded to match the values in ${basedir}/jsf-tools/pom.xml -->