diff -Nru mojarra-2.2.13/jsf-tools/pom.xml mojarra-2.2.13.jdk7/jsf-tools/pom.xml
--- mojarra-2.2.13/jsf-tools/pom.xml	2016-02-04 03:54:54.000000000 +0100
+++ mojarra-2.2.13.jdk7/jsf-tools/pom.xml	2016-09-29 08:58:51.942292347 +0200
@@ -102,7 +102,7 @@
       <activation>
         <property>
           <name>java.vendor</name>
-          <value>Sun Microsystems Inc.</value>
+          <value>Oracle Corporation</value>
         </property>
       </activation>
       <dependencies>
@@ -110,8 +110,6 @@
           <groupId>com.sun</groupId>
           <artifactId>tools</artifactId>
           <version>1.6.0</version>
-          <scope>system</scope>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
       </dependencies>
     </profile>
@@ -125,8 +123,6 @@
           <groupId>com.sun</groupId>
           <artifactId>tools</artifactId>
           <version>1.7.0</version>
-          <scope>system</scope>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
       </dependencies>
     </profile>
diff -Nru mojarra-2.2.13/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java mojarra-2.2.13.jdk7/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java
--- mojarra-2.2.13/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java	2016-02-04 03:54:54.000000000 +0100
+++ mojarra-2.2.13.jdk7/jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java	2016-09-29 09:01:16.748187939 +0200
@@ -49,6 +49,7 @@
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.jvm.ClassReader;
 import com.sun.tools.javac.jvm.ClassWriter;
 import com.sun.tools.javac.jvm.Pool;
@@ -182,7 +183,7 @@
         ClassReader reader = ClassReader.instance(task.getContext());
         ClassWriter writer = ClassWriter.instance(task.getContext());
         Type.moreInfo = true;
-        Pool pool = new Pool();
+        Pool pool = new Pool(Types.instance(task.getContext()));
 	ClassSymbol cs = null;
         try {
             for (JavaFileObject file : fm.list(jarLocation, "", EnumSet.of(CLASS), true)) {
