Squashed 'apache-el/src/main/' changes from 2c946d4..3e8bb9a

3e8bb9a Fix broken test, uncovered by the fix for BZ 56223.
7aa60c2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56223 Throw an IllegalStateException if a call is made to ServletContext.setInitParameter() after the ServletContext has been initialized
a14e333 Update changelog
b8c813f Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56190 AsyncContext.complete() should close the response. dispatch() should be used if further output to the response is required.
d0ae559 Follow up to r1574785 - Ensure blockExternal init param is set - Remove unused constant
fa3eefe Better fix for BZ56199 Fix failing unit tests caused by original fix.
b00e0f7 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56199 Restore validateXml option to JspC
85d9984 Align documentation of DBCP examples to match changes from DBCP 1 -> DBCP 2. Specifically, change "maxActive" -> "maxTotal" and "maxWait" -> "maxWaitMillis" in all examples.
0ab34a7 When reporting threads that are still running while web application is being stopped, print their stack traces to the log.
9b3f6e6 Update false positives
237cb14 Add FindBugs fixes to change log
f16124a FindBugs: Remove unnecessary null check
8ee9c3f Findbugs: Remove pointless null check. Refactor.
761bf75 FindBugs: Avoid NPE when flushing batched WebSocket messages.
08b4bd6 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56204 Clean-up
3ea4512 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56217 Left align makes more sense entries might be very long
0cc165d Use the log fallback to log access anyway when something unexpected occurs. Do the same at the end of event to avoid the possibility of skipping recycling.
126781a Handle the maxActive -> maxTotal rename
8745b96 Avoid possible NPE.
1984c83 Fix wrong booleans (which shouldn't change anything in practice, but the code is wrong).
830e1d8 Avoid possible NPE (it really needs to throw a rejected execution instead anyway).
c4488d9 Note DBCP update to a release version.
22fda36 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56010 Documentation part of the fix
82d25ef DBCP 2.0 has been released.
979b3c0 Better way to avoid NPE in resource cache - don't let the request get that far when we know we are going to fail it anyway.
be469f5 Avoid NPE in resource cache when making an invalid request for a resource outside of the web application.
17ef26f Alternative solution to avoiding adding empty packages to JARs.
3fa3d5b Drop the use of filesonly - it caused failures with some applications that scan Tomcat JARs such as Jira.
cae8eca Revert r1573321 as it triggers unit test failures
52f9fcf DBCP update
497e3d0 Avoid internal NullPointerExceptions if a resource is requested from outside the web application root.
2771534 Followup to r1570175 Update compilerSourceVM and compilerTargetVM values in jasper-howto.xml as well.
95cb204 Correct a pair of comment typos

git-subtree-dir: apache-el/src/main
git-subtree-split: 3e8bb9a7da7a9f3ab61ee3d6f9d231f6e356daef
Merge commit '68c951632acf3f80336e3824f7becd6ae7c14f2c'

Conflicts:
	apache-el/src/main/build.properties.default
	apache-el/src/main/build.xml
	apache-el/src/main/java/javax/servlet/jsp/JspFactory.java
	apache-el/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
	apache-el/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java
	apache-el/src/main/java/org/apache/catalina/connector/InputBuffer.java
	apache-el/src/main/java/org/apache/catalina/core/ApplicationContext.java
	apache-el/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
	apache-el/src/main/java/org/apache/catalina/core/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/loader/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
	apache-el/src/main/java/org/apache/catalina/manager/StatusTransformer.java
	apache-el/src/main/java/org/apache/catalina/webresources/AbstractResourceSet.java
	apache-el/src/main/java/org/apache/catalina/webresources/Cache.java
	apache-el/src/main/java/org/apache/catalina/webresources/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/webresources/StandardRoot.java
	apache-el/src/main/java/org/apache/coyote/AsyncContextCallback.java
	apache-el/src/main/java/org/apache/coyote/AsyncStateMachine.java
	apache-el/src/main/java/org/apache/jasper/JspC.java
	apache-el/src/main/java/org/apache/jasper/compiler/JspDocumentParser.java
	apache-el/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
	apache-el/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
	apache-el/src/main/java/org/apache/tomcat/util/scan/Jar.java
	apache-el/src/main/java/org/apache/tomcat/util/threads/TaskQueue.java
	apache-el/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
	apache-el/src/main/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
	apache-el/src/main/res/findbugs/filter-false-positives.xml
	apache-el/src/main/test/org/apache/catalina/core/TestApplicationContext.java
	apache-el/src/main/test/org/apache/catalina/core/TestAsyncContextImpl.java
	apache-el/src/main/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
	apache-el/src/main/test/org/apache/jasper/servlet/TestJspCServletContext.java
	apache-el/src/main/webapps/docs/changelog.xml
	apache-el/src/main/webapps/docs/jasper-howto.xml
	apache-el/src/main/webapps/docs/jndi-datasource-examples-howto.xml
	apache-el/src/main/webapps/docs/jndi-resources-howto.xml
Squashed 'apache-jsp/src/main/' changes from 2c946d4..3e8bb9a

3e8bb9a Fix broken test, uncovered by the fix for BZ 56223.
7aa60c2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56223 Throw an IllegalStateException if a call is made to ServletContext.setInitParameter() after the ServletContext has been initialized
a14e333 Update changelog
b8c813f Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56190 AsyncContext.complete() should close the response. dispatch() should be used if further output to the response is required.
d0ae559 Follow up to r1574785 - Ensure blockExternal init param is set - Remove unused constant
fa3eefe Better fix for BZ56199 Fix failing unit tests caused by original fix.
b00e0f7 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56199 Restore validateXml option to JspC
85d9984 Align documentation of DBCP examples to match changes from DBCP 1 -> DBCP 2. Specifically, change "maxActive" -> "maxTotal" and "maxWait" -> "maxWaitMillis" in all examples.
0ab34a7 When reporting threads that are still running while web application is being stopped, print their stack traces to the log.
9b3f6e6 Update false positives
237cb14 Add FindBugs fixes to change log
f16124a FindBugs: Remove unnecessary null check
8ee9c3f Findbugs: Remove pointless null check. Refactor.
761bf75 FindBugs: Avoid NPE when flushing batched WebSocket messages.
08b4bd6 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56204 Clean-up
3ea4512 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56217 Left align makes more sense entries might be very long
0cc165d Use the log fallback to log access anyway when something unexpected occurs. Do the same at the end of event to avoid the possibility of skipping recycling.
126781a Handle the maxActive -> maxTotal rename
8745b96 Avoid possible NPE.
1984c83 Fix wrong booleans (which shouldn't change anything in practice, but the code is wrong).
830e1d8 Avoid possible NPE (it really needs to throw a rejected execution instead anyway).
c4488d9 Note DBCP update to a release version.
22fda36 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56010 Documentation part of the fix
82d25ef DBCP 2.0 has been released.
979b3c0 Better way to avoid NPE in resource cache - don't let the request get that far when we know we are going to fail it anyway.
be469f5 Avoid NPE in resource cache when making an invalid request for a resource outside of the web application.
17ef26f Alternative solution to avoiding adding empty packages to JARs.
3fa3d5b Drop the use of filesonly - it caused failures with some applications that scan Tomcat JARs such as Jira.
cae8eca Revert r1573321 as it triggers unit test failures
52f9fcf DBCP update
497e3d0 Avoid internal NullPointerExceptions if a resource is requested from outside the web application root.
2771534 Followup to r1570175 Update compilerSourceVM and compilerTargetVM values in jasper-howto.xml as well.
95cb204 Correct a pair of comment typos

git-subtree-dir: apache-jsp/src/main
git-subtree-split: 3e8bb9a7da7a9f3ab61ee3d6f9d231f6e356daef
Merge commit '70eabb2c807c2f537ac047afe5e8c3281ce8f62e'

Conflicts:
	apache-jsp/src/main/build.properties.default
	apache-jsp/src/main/build.xml
	apache-jsp/src/main/java/javax/servlet/jsp/JspFactory.java
	apache-jsp/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
	apache-jsp/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java
	apache-jsp/src/main/java/org/apache/catalina/connector/InputBuffer.java
	apache-jsp/src/main/java/org/apache/catalina/core/ApplicationContext.java
	apache-jsp/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
	apache-jsp/src/main/java/org/apache/catalina/core/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/loader/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
	apache-jsp/src/main/java/org/apache/catalina/manager/StatusTransformer.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/AbstractResourceSet.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/Cache.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/webresources/StandardRoot.java
	apache-jsp/src/main/java/org/apache/coyote/AsyncContextCallback.java
	apache-jsp/src/main/java/org/apache/coyote/AsyncStateMachine.java
	apache-jsp/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
	apache-jsp/src/main/java/org/apache/tomcat/util/threads/TaskQueue.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
	apache-jsp/src/main/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
	apache-jsp/src/main/res/findbugs/filter-false-positives.xml
	apache-jsp/src/main/test/org/apache/catalina/core/TestApplicationContext.java
	apache-jsp/src/main/test/org/apache/catalina/core/TestAsyncContextImpl.java
	apache-jsp/src/main/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
	apache-jsp/src/main/test/org/apache/jasper/servlet/TestJspCServletContext.java
	apache-jsp/src/main/webapps/docs/changelog.xml
	apache-jsp/src/main/webapps/docs/jasper-howto.xml
	apache-jsp/src/main/webapps/docs/jndi-datasource-examples-howto.xml
	apache-jsp/src/main/webapps/docs/jndi-resources-howto.xml