diff --git a/README.md b/README.md
index 81bda7e..9bc2276 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,14 @@
 [![Build Status](https://travis-ci.org/apache/myfaces.svg?branch=master)](https://travis-ci.org/apache/myfaces)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-Apache's implementation of the JavaServer Faces (JSF) and Jakarta Faces specification 
+Apache's implementation of the JavaServer Faces (JSF) and Jakarta Faces specification
 
 ## Branches
 
 ### Master
 
 Master / 2.3-next equals the JSF 2.3 API but delegates @ManagedBeans to CDI. The implementation of the old FacesEL (javax.faces.el.*) has been completely removed.
+It will be the base of the upcoming JSF 4.0.
 
 ### 3.0.x
 
@@ -28,7 +29,7 @@
 - JSTL 1.2 (optional)
 - BV 1.1 (optional)
 
-Servlet 4.0 will enable JSF 2.3 to serve resources via HTTP/2 push.   
+Servlet 4.0 will enable JSF to serve resources via HTTP/2 push.
 
 ## Installation
 
@@ -84,7 +85,7 @@
 
 ## Quarkus extension
 
-Since 2.3-next a Quarkus extension is available. A sample project can be found here: https://github.com/apache/myfaces/blob/master/extensions/quarkus/showcase/  
+Since 2.3-next a Quarkus extension is available. A sample project can be found here: https://github.com/apache/myfaces/blob/master/extensions/quarkus/showcase/
 
 
 ### Differences to a normal servlet container
diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
index 5c8565c..422db0a 100644
--- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
+++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
@@ -525,7 +525,6 @@
                 "org/apache/myfaces/resource/web-facesconfig_2_1.dtd",
                 "org/apache/myfaces/resource/web-facesconfig_2_2.dtd", 
                 "org/apache/myfaces/resource/web-facesconfig_2_3.dtd",
-                "org/apache/myfaces/resource/web-facesconfig_3_0.dtd",
                 "org/apache/myfaces/resource/xml.xsd",
                 "META-INF/rsc/myfaces-dev-error-include.xml",
                 "META-INF/services/javax.servlet.ServletContainerInitializer"));
diff --git a/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_3_0.xsd b/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_3_0.xsd
deleted file mode 100644
index 69bbea9..0000000
--- a/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_3_0.xsd
+++ /dev/null
@@ -1,791 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-  ** This XSD contains only the programatic elements required for an implementation.
-  ** For the XSD from Sun that includes documentation and other copyrighted information
-  ** please refer to the latest XSD at :
-  ** http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee" attributeFormDefault="unqualified"
-    elementFormDefault="qualified" targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"
-    version="2.3">
-
-    <xsd:include schemaLocation="javaee_5.xsd"/>
-
-    <xsd:element name="faces-config" type="javaee:faces-configType">
-        <xsd:unique name="faces-config-behavior-ID-uniqueness">
-            <xsd:selector xpath="javaee:behavior"/>
-            <xsd:field xpath="javaee:behavior-id"/>
-        </xsd:unique>
-        <xsd:unique name="faces-config-converter-ID-uniqueness">
-            <xsd:selector xpath="javaee:converter"/>
-            <xsd:field xpath="javaee:converter-id"/>
-        </xsd:unique>
-        <xsd:unique name="faces-config-converter-for-class-uniqueness">
-            <xsd:selector xpath="javaee:converter"/>
-            <xsd:field xpath="javaee:converter-for-class"/>
-        </xsd:unique>
-        <xsd:unique name="faces-config-validator-ID-uniqueness">
-            <xsd:selector xpath="javaee:validator"/>
-            <xsd:field xpath="javaee:validator-id"/>
-        </xsd:unique>
-    </xsd:element>
-
-    <xsd:complexType name="faces-configType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:element name="application" type="javaee:faces-config-applicationType"/>
-            <xsd:element name="ordering" type="javaee:faces-config-orderingType"/>
-            <xsd:element name="absolute-ordering" type="javaee:faces-config-absoluteOrderingType"/>
-            <xsd:element name="factory" type="javaee:faces-config-factoryType"/>
-            <xsd:element name="component" type="javaee:faces-config-componentType"/>
-            <xsd:element name="converter" type="javaee:faces-config-converterType"/>
-            <xsd:element name="flow-definition" type="javaee:faces-config-flow-definitionType"/>
-            <xsd:element name="name" type="javaee:java-identifierType" minOccurs="0"/>
-            <xsd:element name="navigation-rule" type="javaee:faces-config-navigation-ruleType"/>
-            <xsd:element name="protected-views" type="javaee:faces-config-protected-viewsType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="referenced-bean" type="javaee:faces-config-referenced-beanType"/>
-            <xsd:element name="render-kit" type="javaee:faces-config-render-kitType"/>
-            <xsd:element name="lifecycle" type="javaee:faces-config-lifecycleType"/>
-            <xsd:element name="validator" type="javaee:faces-config-validatorType"/>
-            <xsd:element name="behavior" type="javaee:faces-config-behaviorType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="faces-config-extension"
-                type="javaee:faces-config-extensionType"/>
-        </xsd:choice>
-        <xsd:attribute name="metadata-complete" type="xsd:boolean" use="optional"></xsd:attribute>
-        <xsd:attribute name="id" type="xsd:ID"/>
-        <xsd:attribute name="version" type="javaee:faces-config-versionType" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-applicationType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:element name="action-listener" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="default-render-kit-id" type="javaee:string"/>
-            <xsd:element name="message-bundle" type="javaee:string"/>
-            <xsd:element name="navigation-handler" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="view-handler" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="resource-handler" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="state-manager" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="el-resolver" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="resource-library-contracts"
-                   type="javaee:faces-config-application-resource-library-contractsType"/>
-            <xsd:element name="search-expression-handler" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="search-keyword-resolver" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="locale-config" type="javaee:faces-config-locale-configType"/>
-            <xsd:element name="resource-bundle"
-                type="javaee:faces-config-application-resource-bundleType"/>
-            <xsd:element name="default-validators" type="javaee:faces-config-default-validatorsType"/>
-            <xsd:element name="partial-traversal" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="system-event-listener" type="javaee:faces-config-system-event-listenerType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="application-extension"
-                type="javaee:faces-config-application-extensionType"/>
-        </xsd:choice>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-orderingType">
-        <xsd:sequence>
-            <xsd:element name="after" type="javaee:faces-config-ordering-orderingType" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="before" type="javaee:faces-config-ordering-orderingType" minOccurs="0" maxOccurs="1"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-ordering-orderingType">
-        <xsd:sequence>
-            <xsd:element name="name" type="javaee:java-identifierType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="others" type="javaee:faces-config-ordering-othersType" minOccurs="0" maxOccurs="1" />
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-ordering-othersType">
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-absoluteOrderingType">
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="name" type="javaee:java-identifierType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="others" type="javaee:faces-config-ordering-othersType" minOccurs="0" maxOccurs="1" />
-        </xsd:choice>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-application-resource-bundleType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="base-name" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="var" type="javaee:string"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-application-resource-library-contractsType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="contract-mapping"
-                   type="javaee:faces-config-application-resource-library-contracts-contract-mappingType"
-                   maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-application-resource-library-contracts-contract-mappingType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="url-pattern" type="javaee:url-patternType" maxOccurs="unbounded"/>
-            <xsd:element name="contracts" type="javaee:string" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-application-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-factoryType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:element name="application-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="exception-handler-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="external-context-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="faces-context-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="facelet-cache-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="partial-view-context-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="lifecycle-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="view-declaration-language-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="tag-handler-delegate-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="render-kit-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="visit-context-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="flash-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="flow-handler-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="client-window-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="search-expression-context-factory" type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="factory-extension"
-                type="javaee:faces-config-factory-extensionType"/>
-        </xsd:choice>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-factory-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-attributeType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="attribute-name" type="javaee:string"/>
-            <xsd:element name="attribute-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element minOccurs="0" name="default-value"
-                type="javaee:faces-config-default-valueType"/>
-            <xsd:element minOccurs="0" name="suggested-value"
-                type="javaee:faces-config-suggested-valueType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute-extension"
-                type="javaee:faces-config-attribute-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-attribute-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-componentType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="component-type" type="javaee:string"/>
-            <xsd:element name="component-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="facet"
-                type="javaee:faces-config-facetType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute"
-                type="javaee:faces-config-attributeType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="property"
-                type="javaee:faces-config-propertyType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="component-extension"
-                type="javaee:faces-config-component-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-component-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-default-localeType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-localeType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-default-valueType">
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:simpleType name="faces-config-el-expressionType">
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="#\{.*\}"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:complexType name="faces-config-facetType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="facet-name" type="javaee:java-identifierType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="facet-extension"
-                type="javaee:faces-config-facet-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-facet-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-from-view-idType">
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-from-actionType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-converterType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:choice>
-                <xsd:element name="converter-id" type="javaee:string"/>
-                <xsd:element name="converter-for-class" type="javaee:fully-qualified-classType"/>
-            </xsd:choice>
-            <xsd:element name="converter-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute"
-                type="javaee:faces-config-attributeType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="property"
-                type="javaee:faces-config-propertyType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="converter-extension"
-                type="javaee:faces-config-converter-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-converter-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-lifecycleType">
-        <xsd:sequence>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="phase-listener"
-                type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="lifecycle-extension"
-                type="javaee:faces-config-lifecycle-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-lifecycle-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:simpleType name="faces-config-localeType">
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:complexType name="faces-config-locale-configType">
-        <xsd:sequence>
-            <xsd:element minOccurs="0" name="default-locale"
-                type="javaee:faces-config-default-localeType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="supported-locale"
-                type="javaee:faces-config-supported-localeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definitionType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="start-node" type="javaee:java-identifierType" minOccurs="0"/>
-            <xsd:element name="view" type="javaee:faces-config-flow-definition-viewType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="switch" type="javaee:faces-config-flow-definition-switchType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="flow-return" type="javaee:faces-config-flow-definition-flow-returnType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="navigation-rule" type="javaee:faces-config-navigation-ruleType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="flow-call" type="javaee:faces-config-flow-definition-flow-callType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="method-call" type="javaee:faces-config-flow-definition-faces-method-callType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="initializer" type="javaee:faces-config-flow-definition-initializerType" minOccurs="0"/>
-            <xsd:element name="finalizer" type="javaee:faces-config-flow-definition-finalizerType" minOccurs="0"/>
-            <xsd:element name="inbound-parameter" type="javaee:faces-config-flow-definition-inbound-parameterType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-parameter-valueType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-faces-method-callType">
-        <xsd:sequence>
-            <xsd:element name="method" type="javaee:faces-config-flow-definition-faces-method-call-methodType"/>
-            <xsd:element name="default-outcome" type="javaee:string"/>
-            <xsd:element name="parameter"
-                   type="javaee:faces-config-flow-definition-flow-call-parameterType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-faces-method-call-methodType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-flow-call-parameterType">
-        <xsd:sequence>
-            <xsd:element name="class" type="javaee:string" minOccurs="0"/>
-            <xsd:element name="value" type="javaee:faces-config-flow-definition-parameter-valueType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-viewType">
-        <xsd:sequence>
-            <xsd:element name="vdl-document" type="javaee:pathType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-switchType">
-        <xsd:sequence>
-            <xsd:element name="case" type="javaee:faces-config-flow-definition-switch-caseType"
-                   minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="default-outcome" type="javaee:string" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-switch-caseType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="if" type="javaee:faces-config-ifType" minOccurs="0"/>
-            <xsd:element name="from-outcome" type="javaee:string" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-flow-returnType">
-        <xsd:sequence>
-            <xsd:element name="from-outcome" type="javaee:string"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-flow-callType">
-        <xsd:sequence>
-            <xsd:element name="flow-reference" type="javaee:faces-config-flow-definition-flow-call-flow-referenceType"/>
-            <xsd:element name="outbound-parameter" type="javaee:faces-config-flow-definition-flow-call-outbound-parameterType"
-                   minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-flow-call-flow-referenceType">
-        <xsd:sequence>
-            <xsd:element name="flow-document-id" type="javaee:java-identifierType" minOccurs="0"/>
-            <xsd:element name="flow-id" type="javaee:java-identifierType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-initializerType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-finalizerType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-inbound-parameterType">
-        <xsd:sequence>
-            <xsd:element name="name" type="javaee:java-identifierType"/>
-            <xsd:element name="value" type="javaee:faces-config-flow-definition-parameter-valueType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-flow-definition-flow-call-outbound-parameterType">
-        <xsd:sequence>
-            <xsd:element name="name" type="javaee:java-identifierType"/>
-            <xsd:element name="value" type="javaee:faces-config-flow-definition-parameter-valueType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-map-entryType">
-        <xsd:sequence>
-            <xsd:element name="key" type="javaee:string"/>
-            <xsd:choice>
-                <xsd:element name="null-value" type="javaee:faces-config-null-valueType"/>
-                <xsd:element name="value" type="javaee:faces-config-valueType"/>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-map-entriesType">
-        <xsd:sequence>
-            <xsd:element minOccurs="0" name="key-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element minOccurs="0" name="value-class"
-                type="javaee:faces-config-value-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="map-entry"
-                type="javaee:faces-config-map-entryType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-navigation-caseType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element minOccurs="0" name="from-action"
-                type="javaee:faces-config-from-actionType"/>
-            <xsd:element minOccurs="0" name="from-outcome" type="javaee:string"/>
-            <xsd:element name="if" type="javaee:faces-config-ifType" minOccurs="0" />
-            <xsd:element name="to-view-id" type="javaee:faces-config-valueType" />
-            <xsd:element name="to-flow-document-id" type="javaee:java-identifierType" minOccurs="0"/>
-            <xsd:element minOccurs="0" name="redirect" type="javaee:faces-config-redirectType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-     <xsd:complexType name="faces-config-ifType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID" />
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-navigation-ruleType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element minOccurs="0" name="from-view-id"
-                type="javaee:faces-config-from-view-idType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="navigation-case"
-                type="javaee:faces-config-navigation-caseType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="navigation-rule-extension"
-                type="javaee:faces-config-navigation-rule-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-navigation-rule-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-null-valueType">
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-propertyType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="property-name" type="javaee:string"/>
-            <xsd:element name="property-class" type="javaee:java-typeType"/>
-            <xsd:element minOccurs="0" name="default-value"
-                type="javaee:faces-config-default-valueType"/>
-            <xsd:element minOccurs="0" name="suggested-value"
-                type="javaee:faces-config-suggested-valueType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="property-extension"
-                type="javaee:faces-config-property-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-protected-viewsType">
-        <xsd:sequence>
-            <xsd:element name="url-pattern" type="javaee:url-patternType" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-property-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-redirectType">
-        <xsd:annotation>
-            <xsd:documentation>
-                The "redirect" element indicates that navigation to the specified "to-view-id" should be
-                accomplished by performing an HTTP redirect rather than the usual ViewHandler mechanisms.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="view-param" type="javaee:faces-config-redirect-viewParamType"
-                minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-        <xsd:attribute name="include-view-params" type="xsd:boolean" use="optional"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-redirect-viewParamType">
-        <xsd:annotation>
-            <xsd:documentation>
-                The "view-param" element, only valid within a "redirect" element, contains child
-                "name" and "value" elements that must be included in the redirect url when the
-                redirect is performed.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="name" type="javaee:string" minOccurs="1" maxOccurs="1"/>
-            <xsd:element name="value" type="javaee:string" minOccurs="1" maxOccurs="1"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-referenced-beanType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="referenced-bean-name" type="javaee:java-identifierType"/>
-            <xsd:element name="referenced-bean-class" type="javaee:fully-qualified-classType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-render-kitType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element minOccurs="0" name="render-kit-id" type="javaee:string"/>
-            <xsd:element minOccurs="0" name="render-kit-class"
-                type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="renderer"
-                type="javaee:faces-config-rendererType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="client-behavior-renderer"
-                type="javaee:faces-config-client-behavior-rendererType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="render-kit-extension"
-                type="javaee:faces-config-render-kit-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-rendererType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="component-family" type="javaee:string"/>
-            <xsd:element name="renderer-type" type="javaee:string"/>
-            <xsd:element name="renderer-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="facet"
-                type="javaee:faces-config-facetType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute"
-                type="javaee:faces-config-attributeType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="renderer-extension"
-                type="javaee:faces-config-renderer-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-renderer-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-render-kit-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-suggested-valueType">
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-supported-localeType">
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-localeType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-validatorType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="validator-id" type="javaee:string"/>
-            <xsd:element name="validator-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute"
-                type="javaee:faces-config-attributeType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="property"
-                type="javaee:faces-config-propertyType"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="0" name="validator-extension"
-                type="javaee:faces-config-validator-extensionType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-validator-extensionType">
-        <xsd:sequence>
-            <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##any" processContents="lax"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:simpleType name="faces-config-valueType">
-        <xsd:union memberTypes="javaee:faces-config-el-expressionType xsd:string"/>
-    </xsd:simpleType>
-
-    <xsd:complexType name="faces-config-value-classType">
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-list-entriesType">
-        <xsd:sequence>
-            <xsd:element minOccurs="0" name="value-class"
-                type="javaee:faces-config-value-classType"/>
-            <xsd:choice maxOccurs="unbounded" minOccurs="0">
-                <xsd:element name="null-value" type="javaee:faces-config-null-valueType"/>
-                <xsd:element name="value" type="javaee:faces-config-valueType"/>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-default-validatorsType">
-        <xsd:sequence>
-            <xsd:element name="validator-id" type="javaee:string" minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-system-event-listenerType">
-        <xsd:sequence>
-            <xsd:element name="system-event-listener-class"
-                type="javaee:fully-qualified-classType"/>
-            <xsd:element name="system-event-class"
-                type="javaee:fully-qualified-classType"/>
-            <xsd:element name="source-class" minOccurs="0"
-                type="javaee:fully-qualified-classType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-behaviorType">
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="behavior-id" type="javaee:string"/>
-            <xsd:element name="behavior-class" type="javaee:fully-qualified-classType"/>
-            <xsd:element name="attribute" type="javaee:faces-config-attributeType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="property" type="javaee:faces-config-propertyType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="behavior-extension" type="javaee:faces-config-behavior-extensionType"
-                minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-behavior-extensionType">
-        <xsd:sequence>
-            <xsd:any namespace="##any" processContents="lax" minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-client-behavior-rendererType">
-        <xsd:sequence>
-            <xsd:element name="client-behavior-renderer-type" type="javaee:string"/>
-            <xsd:element name="client-behavior-renderer-class" type="javaee:fully-qualified-classType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:simpleType name="faces-config-versionType">
-        <xsd:restriction base="xsd:token">
-            <xsd:enumeration value="1.2"/>
-            <xsd:enumeration value="2.0"/>
-            <xsd:enumeration value="2.1"/>
-            <xsd:enumeration value="2.2"/>
-            <xsd:enumeration value="2.3"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-</xsd:schema>
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
index 9fd4df1..ce915a2 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
@@ -21,7 +21,7 @@
 
 /**
  * <p>Mock implementation of <code>Application</code> that includes the semantics
- * added by JavaServer Faces 3.0.</p>
+ * added by JavaServer Faces 2.3.</p>
  * 
  * @author Leonardo Uribe
  * @since 1.0.0