Squashed 'apache-el/src/main/' changes from e800993..ea454df

ea454df Whoops. Forgot to make sure the test actually passed.
42d78bc Add a test case that demonstrates Bug 56147 is not reproducible.
bb3a4cb Tomcat 8 requires Java 7 so make that the default compiler source and target versions for JSP compilation.
4ce3ce0 Simplify
9b56d8c Follow up to r1570114 Need to include *.properties as well as *.class
e994ed4 Simplify patternsets where possible Avoid pattern sets ending in "/*" as much as possible as they usually result in JARs containing empty packages with the contents of the package in a different JAR
3b6e676 Update changelog
a80759e Update tests to check correct handling elements added between 3.0 and 3.1 Add missing deny-uncovered-http-methods element from merged web.xml
c804e36 Update tests to check correct handling elements added between 2.5 and 3.0.
d055516 Update tests to check correct handling of all other elements added between 2.3 and 2.4.
689d648 Update tests to check correct handling of all top-level elements added between 2.3 and 2.4.
de31b63 Update tests to check correct handling of all attributes added between 2.2 and 2.3.
0c0e5b2 Update tests to check correct handling of all elements added between 2.2 and 2.3.
324e886 Update
fe6e4f2 s/j2se/javase/
97e1369 Make it easier for TomEE to modify the j2seClassLoader
26b2361 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56139 Avoid a web application class loader leak in some unit tests when running on Windows.
17789df Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56137 Explicitly use NIO connector in SSL example in server.xml so it doesn't break if APR is enabled.
fba33bb Add SSL Valve to docs
3a79f57 Correct typo (s/priviledges/privileges), wrap lines

git-subtree-dir: apache-el/src/main
git-subtree-split: ea454dfa9ef0d8b1a13a976c5f9de63edc5171ee
Merge commit '659dab2cc7bc5c0937af231d62d44b584354d41c'

Conflicts:
	apache-el/src/main/build.properties.default
	apache-el/src/main/build.xml
	apache-el/src/main/conf/server.xml
	apache-el/src/main/conf/web.xml
	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/jasper/EmbeddedServletOptions.java
	apache-el/src/main/java/org/apache/jasper/JspC.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/web/WebXml.java
	apache-el/src/main/test/org/apache/el/TestELInJsp.java
	apache-el/src/main/test/org/apache/el/TestMethodExpressionImpl.java
	apache-el/src/main/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
	apache-el/src/main/webapps/docs/changelog.xml
	apache-el/src/main/webapps/docs/config/valve.xml
	apache-el/src/main/webapps/docs/windows-service-howto.xml
Squashed 'apache-jsp/src/main/' changes from e800993..ea454df

ea454df Whoops. Forgot to make sure the test actually passed.
42d78bc Add a test case that demonstrates Bug 56147 is not reproducible.
bb3a4cb Tomcat 8 requires Java 7 so make that the default compiler source and target versions for JSP compilation.
4ce3ce0 Simplify
9b56d8c Follow up to r1570114 Need to include *.properties as well as *.class
e994ed4 Simplify patternsets where possible Avoid pattern sets ending in "/*" as much as possible as they usually result in JARs containing empty packages with the contents of the package in a different JAR
3b6e676 Update changelog
a80759e Update tests to check correct handling elements added between 3.0 and 3.1 Add missing deny-uncovered-http-methods element from merged web.xml
c804e36 Update tests to check correct handling elements added between 2.5 and 3.0.
d055516 Update tests to check correct handling of all other elements added between 2.3 and 2.4.
689d648 Update tests to check correct handling of all top-level elements added between 2.3 and 2.4.
de31b63 Update tests to check correct handling of all attributes added between 2.2 and 2.3.
0c0e5b2 Update tests to check correct handling of all elements added between 2.2 and 2.3.
324e886 Update
fe6e4f2 s/j2se/javase/
97e1369 Make it easier for TomEE to modify the j2seClassLoader
26b2361 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56139 Avoid a web application class loader leak in some unit tests when running on Windows.
17789df Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56137 Explicitly use NIO connector in SSL example in server.xml so it doesn't break if APR is enabled.
fba33bb Add SSL Valve to docs
3a79f57 Correct typo (s/priviledges/privileges), wrap lines

git-subtree-dir: apache-jsp/src/main
git-subtree-split: ea454dfa9ef0d8b1a13a976c5f9de63edc5171ee
Merge commit 'b2b10e2ca21fc46e7f8401381c87395f2be0b6e0'

Conflicts:
	apache-jsp/src/main/build.properties.default
	apache-jsp/src/main/build.xml
	apache-jsp/src/main/conf/server.xml
	apache-jsp/src/main/conf/web.xml
	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/test/org/apache/el/TestELInJsp.java
	apache-jsp/src/main/test/org/apache/el/TestMethodExpressionImpl.java
	apache-jsp/src/main/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
	apache-jsp/src/main/webapps/docs/changelog.xml
	apache-jsp/src/main/webapps/docs/config/valve.xml
	apache-jsp/src/main/webapps/docs/windows-service-howto.xml
default goal