diff -Nru mojarra-2.2.13/common/ant/common.xml mojarra-2.2.13.classpaths/common/ant/common.xml
--- mojarra-2.2.13/common/ant/common.xml	2016-09-30 17:49:29.842439616 +0200
+++ mojarra-2.2.13.classpaths/common/ant/common.xml	2016-09-30 17:46:12.146778795 +0200
@@ -55,7 +55,8 @@
     <taskdef resource="aQute/bnd/ant/taskdef.properties">
         <classpath>
             <pathelement
-                  location="${jsf.build.home}/common/lib/bnd-0.0.249.jar"/>
+                  location="${jsf.build.home}/common/lib/bnd.jar"/>
+            <pathelement location="${jsf.build.home}/common/lib/bndlib.jar"/>
         </classpath>
     </taskdef>
 
@@ -121,7 +122,7 @@
 
     <!-- this is hard coded to match the values in ${basedir}/jsf-tools/pom.xml -->
     <property name="jsf-tools.jar" 
-          value="${maven.repo.local}/com/sun/faces/build/jsf-tools/${impl.version.number}/jsf-tools-${impl.version.number}.jar" />
+          value="${jsf.build.home}/jsf-tools/target/jsf-tools-${impl.version.number}.jar" />
 
     <!-- Test classpaths that are used in multiple places within the project -->
     <path id="junit.classpath">
@@ -159,11 +160,11 @@
     </path>
 
     <path id="compile.classpath">
-        <path refid="compile.path"/>
+        <fileset dir="${jsf.build.home}/lib/compile"/>
     </path>
 
     <path id="cdi.classpath">
-        <path refid="cdi.path"/>
+        <fileset dir="${jsf.build.home}/lib/compile"/>
     </path>
 
 
@@ -173,7 +174,7 @@
     </path>
 
     <path id="apache.commons.classpath">
-        <path refid="commons.path"/>
+        <fileset dir="${jsf.build.home}/lib"/>
     </path>
 
     <!-- HtmlUnit client classpath -->
@@ -190,8 +191,8 @@
         <attribute name="destdir"/>
         <attribute name="includes" default=""/>
         <attribute name="excludes" default=""/>
-        <attribute name="source" default="1.5"/>
-        <attribute name="target" default="1.5"/>
+        <attribute name="source" default="1.6"/>
+        <attribute name="target" default="1.6"/>
         <element name="classpath" implicit="true" optional="yes"/>
         <sequential>           
             <javac srcdir="@{srcdir}"
diff -Nru mojarra-2.2.13/jsf-api/build.xml mojarra-2.2.13.classpaths/jsf-api/build.xml
--- mojarra-2.2.13/jsf-api/build.xml	2016-02-04 03:54:54.000000000 +0100
+++ mojarra-2.2.13.classpaths/jsf-api/build.xml	2016-09-30 17:47:31.236299243 +0200
@@ -86,7 +86,7 @@
         <pathelement location="${jsf-tools.jar}"/>
         <pathelement location="${tools.dir}/build/classes"/>
         <path refid="apache.commons.classpath"/>
-        <path refid="api-compile.classpath"/>
+        <path refid="compile.classpath"/>
         <path refid="junit.classpath"/>
     </path>
 
@@ -158,7 +158,7 @@
         <jsf.javac destdir="${build.classes.dir}"
                    srcdir="${src.dir}:${build.generate.dir}">
             <classpath>
-                <path refid="api-compile.classpath"/>
+                <path refid="compile.classpath"/>
             </classpath>
         </jsf.javac>
     </target>
@@ -805,7 +805,7 @@
             <fileset dir="${build.generate.dir}">
                 <include name="**/*.java"/>
             </fileset>
-            <classpath refid="api-compile.classpath"/>
+            <classpath refid="compile.classpath"/>
         </javadoc>
 
         <javadoc packagenames="javax.*"