[java-idp-tomcat-base] 01/10: Updates for Tomcat 10.1
Tom Zeller
tzeller at dragonacea.biz
Tue Aug 8 12:44:06 UTC 2023
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch 10.1
in repository java-idp-tomcat-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-tomcat-base.git;a=commit;h=b4fda8efeb726e848e2bbb4f0cf1cc9cdb897a88
commit b4fda8efeb726e848e2bbb4f0cf1cc9cdb897a88
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Jul 25 11:06:42 2023 -0500
Updates for Tomcat 10.1
---
pom.xml | 2 +-
.../resources/tomcat-base/conf/catalina.properties | 20 +++++++---
src/main/resources/tomcat-base/conf/context.xml | 6 ++-
src/main/resources/tomcat-base/conf/server.xml | 44 ++++++++--------------
src/main/resources/tomcat-base/conf/web.xml | 28 +++++++-------
5 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8517ae4..f1d7f31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-tomcat-base</artifactId>
<packaging>pom</packaging>
- <version>9.0.0-SNAPSHOT</version>
+ <version>10.1.0-SNAPSHOT</version>
<properties>
<assemblyDirectory>${project.build.directory}/idp-tomcat-base</assemblyDirectory>
diff --git a/src/main/resources/tomcat-base/conf/catalina.properties b/src/main/resources/tomcat-base/conf/catalina.properties
index cfd37c2..51fb57a 100644
--- a/src/main/resources/tomcat-base/conf/catalina.properties
+++ b/src/main/resources/tomcat-base/conf/catalina.properties
@@ -108,10 +108,12 @@ shared.loader=
tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
annotations-api.jar,\
ant-junit*.jar,\
-ant-launcher.jar,\
-ant.jar,\
+ant-launcher*.jar,\
+ant*.jar,\
asm-*.jar,\
aspectj*.jar,\
+bcel*.jar,\
+biz.aQute.bnd*.jar,\
bootstrap.jar,\
catalina-ant.jar,\
catalina-ha.jar,\
@@ -124,6 +126,7 @@ cobertura-*.jar,\
commons-beanutils*.jar,\
commons-codec*.jar,\
commons-collections*.jar,\
+commons-compress*.jar,\
commons-daemon.jar,\
commons-dbcp*.jar,\
commons-digester*.jar,\
@@ -146,6 +149,7 @@ hamcrest-*.jar,\
hibernate*.jar,\
httpclient*.jar,\
icu4j-*.jar,\
+jakartaee-migration-*.jar,\
jasper-el.jar,\
jasper.jar,\
jaspic-api.jar,\
@@ -165,6 +169,8 @@ log4j*.jar,\
mail*.jar,\
objenesis-*.jar,\
oraclepki.jar,\
+org.hamcrest.core_*.jar,\
+org.junit_*.jar,\
oro-*.jar,\
servlet-api-*.jar,\
servlet-api.jar,\
@@ -183,7 +189,9 @@ tomcat-util-scan.jar,\
tomcat-util.jar,\
tomcat-websocket.jar,\
tools.jar,\
+unboundid-ldapsdk-*.jar,\
websocket-api.jar,\
+websocket-client-api.jar,\
wsdl4j*.jar,\
xercesImpl.jar,\
xml-apis.jar,\
@@ -342,8 +350,6 @@ unboundid-ldapsdk-*.jar,\
velocity-*.jar,\
xmlsec-*.jar
-
-
# Default list of JAR files that should be scanned that overrides the default
# jarsToSkip list above. This is typically used to include a specific JAR that
# has been excluded by a broad file name pattern in the jarsToSkip list.
@@ -351,7 +357,7 @@ xmlsec-*.jar
# scan types by configuring a JarScanner with a nested JarScanFilter.
tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
log4j-taglib*.jar,\
-log4j-web*.jar,\
+log4j-jakarta-web*.jar,\
log4javascript*.jar,\
slf4j-taglib*.jar
@@ -361,6 +367,10 @@ tomcat.util.buf.StringCache.byte.enabled=true
#tomcat.util.buf.StringCache.trainThreshold=500000
#tomcat.util.buf.StringCache.cacheSize=5000
+# Disable use of some privilege blocks Tomcat doesn't need since calls to the
+# code in question are always already inside a privilege block
+org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED=false
+
#
# Shibboleth IdP properties
#
diff --git a/src/main/resources/tomcat-base/conf/context.xml b/src/main/resources/tomcat-base/conf/context.xml
index 98312b8..fa2ccbd 100644
--- a/src/main/resources/tomcat-base/conf/context.xml
+++ b/src/main/resources/tomcat-base/conf/context.xml
@@ -24,8 +24,10 @@
<WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
- <!-- Uncomment this to disable session persistence across Tomcat restarts -->
- <Manager pathname="" />
+ <!-- Uncomment this to enable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="SESSIONS.ser" />
+ -->
<!-- Increase static resource cache size to avoid log warnings. -->
<Resources cachingAllowed="true" cacheMaxSize="20480" />
diff --git a/src/main/resources/tomcat-base/conf/server.xml b/src/main/resources/tomcat-base/conf/server.xml
index 0aa64c3..fc5b3f4 100644
--- a/src/main/resources/tomcat-base/conf/server.xml
+++ b/src/main/resources/tomcat-base/conf/server.xml
@@ -24,7 +24,7 @@
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
- <!--APR library loader. Documentation at /docs/apr.html -->
+ <!-- APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
@@ -61,9 +61,8 @@
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
- Java HTTP Connector: /docs/config/http.html
- Java AJP Connector: /docs/config/ajp.html
- APR (HTTP/AJP) Connector: /docs/apr.html
+ HTTP Connector: /docs/config/http.html
+ AJP Connector: /docs/config/ajp.html
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
@@ -79,9 +78,11 @@
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" />
+ redirectPort="8443"
+ maxParameterCount="1000"
+ />
-->
- <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native
library and the useOpenSSL attribute of the AprLifecycleListener.
@@ -90,27 +91,12 @@
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true">
- <SSLHostConfig>
- <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
- type="RSA" />
- </SSLHostConfig>
- </Connector>
- -->
- <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
- This connector uses the APR/native implementation which always uses
- OpenSSL for TLS.
- Either JSSE or OpenSSL style configuration may be used. OpenSSL style
- configuration is used below.
- -->
- <!--
- <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
- maxThreads="150" SSLEnabled="true" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
- <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
- certificateFile="conf/localhost-rsa-cert.pem"
- certificateChainFile="conf/localhost-rsa-chain.pem"
+ <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
</SSLHostConfig>
</Connector>
@@ -131,7 +117,7 @@
</SSLHostConfig>
</Connector>
- <!-- Define dedicated SOAP connector for back-channel requests
+ <!-- TODO Define dedicated SOAP connector for back-channel requests
<Connector
address="${tomcat.https.host}"
port="${tomcat.backchannel.port}"
@@ -148,11 +134,13 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <!--
+ <!--
<Connector protocol="AJP/1.3"
address="::1"
port="8009"
- redirectPort="8443" />
+ redirectPort="8443"
+ maxParameterCount="1000"
+ />
-->
<!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/src/main/resources/tomcat-base/conf/web.xml b/src/main/resources/tomcat-base/conf/web.xml
index d0d4f31..8f706c8 100644
--- a/src/main/resources/tomcat-base/conf/web.xml
+++ b/src/main/resources/tomcat-base/conf/web.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
- version="4.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+ version="6.0">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
@@ -32,6 +32,11 @@
<!-- They should go in the "/WEB-INF/web.xml" file in your application. -->
+ <!-- Set the default request and response character encodings to UTF-8. -->
+ <request-character-encoding>UTF-8</request-character-encoding>
+ <response-character-encoding>UTF-8</response-character-encoding>
+
+
<!-- ================== Built In Servlet Definitions ==================== -->
@@ -150,9 +155,9 @@
<!-- pages. See the jasper documentation for more -->
<!-- information. -->
<!-- -->
- <!-- compilerSourceVM Compiler source VM. [1.8] -->
+ <!-- compilerSourceVM Compiler source VM. [11] -->
<!-- -->
- <!-- compilerTargetVM Compiler target VM. [1.8] -->
+ <!-- compilerTargetVM Compiler target VM. [11] -->
<!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
@@ -192,11 +197,6 @@
<!-- arrays, to improve performance in some cases? -->
<!-- [false] -->
<!-- -->
- <!-- ieClassId Deprecated. Will be removed in Tomcat 10.1 -->
- <!-- The class-id value to be sent to Internet -->
- <!-- Explorer when using <jsp:plugin> tags. -->
- <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
- <!-- -->
<!-- javaEncoding Java file encoding to use for generating java -->
<!-- source files. [UTF8] -->
<!-- -->
@@ -363,7 +363,7 @@
<!-- the arguments to the OS. See the CGI How-To -->
<!-- for more details. The default varies by -->
<!-- platform. -->
- <!-- Windows: [[a-zA-Z0-9\Q-_.\\/:\E]+] -->
+ <!-- Windows: [[\w\Q-.\\/:\E]+] -->
<!-- Others: [.*] -->
<!-- Note that internally the CGI Servlet treats -->
<!-- [.*] as a special case to improve performance -->
@@ -374,7 +374,7 @@
<!-- command line arguments must match else the -->
<!-- request will be rejected. The default matches -->
<!-- the allowed values defined by RFC3875. -->
- <!-- [[a-zA-Z0-9\Q%;/?:@&,$-_.!~*'()\E]+] -->
+ <!-- [[\w\Q%;/?:@&,$-.!~*'()\E]+] -->
<!-- -->
<!-- enableCmdLineArguments -->
<!-- Are command line parameters generated from -->
@@ -2124,7 +2124,7 @@
</mime-mapping>
<mime-mapping>
<extension>js</extension>
- <mime-type>application/javascript</mime-type>
+ <mime-type>text/javascript</mime-type>
</mime-mapping>
<mime-mapping>
<extension>jsf</extension>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list