This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 0600db4d74 TOMEE-4201 - Tomcat 9.0.74
0600db4d74 is described below
commit 0600db4d74e35a341876e5c7b258466df94af894
Author: Richard Zowalla <[email protected]>
AuthorDate: Wed Apr 19 20:16:58 2023 +0200
TOMEE-4201 - Tomcat 9.0.74
---
.../src/main/resources/tomee/conf/server.xml | 20 +++++++++++++++-----
boms/tomee-plume/pom.xml | 11 +++++++++++
.../src/main/resources/tomee/conf/server.xml | 20 +++++++++++++++-----
boms/tomee-plus/pom.xml | 11 +++++++++++
.../src/main/resources/tomee/conf/server.xml | 20 +++++++++++++++-----
.../src/main/resources/tomee/conf/server.xml | 20 +++++++++++++++-----
pom.xml | 2 +-
.../java/org/apache/tomee/installer/Installer.java | 20 +++++++++-----------
8 files changed, 92 insertions(+), 32 deletions(-)
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
index f36880ec3b..6e7a687367 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
@@ -70,13 +70,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
+ redirectPort="8443"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" />
<!-- A "Connector" using the shared thread pool-->
<!--
<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
This connector uses the NIO implementation. The default
@@ -87,7 +91,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -102,7 +108,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11AprProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -118,7 +126,9 @@
<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/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 83a74265e3..e20c9020a2 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -122,6 +122,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
index f36880ec3b..6e7a687367 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
@@ -70,13 +70,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
+ redirectPort="8443"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" />
<!-- A "Connector" using the shared thread pool-->
<!--
<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
This connector uses the NIO implementation. The default
@@ -87,7 +91,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -102,7 +108,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11AprProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -118,7 +126,9 @@
<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/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index bf379ebe1e..c7c54bb644 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -122,6 +122,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
index f36880ec3b..6e7a687367 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
@@ -70,13 +70,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
+ redirectPort="8443"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" />
<!-- A "Connector" using the shared thread pool-->
<!--
<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
This connector uses the NIO implementation. The default
@@ -87,7 +91,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -102,7 +108,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11AprProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -118,7 +126,9 @@
<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/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
index f36880ec3b..6e7a687367 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
@@ -70,13 +70,17 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" xpoweredBy="false" server="Apache TomEE" />
+ redirectPort="8443"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" />
<!-- A "Connector" using the shared thread pool-->
<!--
<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
This connector uses the NIO implementation. The default
@@ -87,7 +91,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
type="RSA" />
@@ -102,7 +108,9 @@
-->
<!--
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11AprProtocol"
- maxThreads="150" SSLEnabled="true" xpoweredBy="false"
server="Apache TomEE" >
+ maxThreads="150" SSLEnabled="true"
+ maxParameterCount="1000"
+ xpoweredBy="false" server="Apache TomEE" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
@@ -118,7 +126,9 @@
<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/pom.xml b/pom.xml
index e54e5896c3..9843497323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,7 @@
<version.geronimo-javamail_1.6_spec>1.0.1</version.geronimo-javamail_1.6_spec>
<!-- Jakarta EE Impl. -->
- <tomcat.version>9.0.73</tomcat.version>
+ <tomcat.version>9.0.74</tomcat.version>
<!-- com.sun -->
<version.impl.saaj>1.5.3</version.impl.saaj>
<!-- org.apache -->
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 69d3cc1281..7d24aeb440 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -636,12 +636,12 @@ public class Installer implements InstallerInterface {
"\n" +
"# ----- Execute The Requested Command");
- newCatalinaSh = newCatalinaSh.replace(" \"$_RUNJAVA\" \\\n" +
- " -classpath \"$CATALINA_HOME/lib/catalina.jar\" \\\n" +
- " org.apache.catalina.util.ServerInfo",
- " \"$_RUNJAVA\" \\\n" +
- " -classpath
\"$CATALINA_HOME/lib/catalina.jar:$CATALINA_HOME/lib/openejb-core-"+
properties.get("tomee.version") + ".jar\" \\\n" +
- " org.apache.catalina.util.ServerInfo");
+ newCatalinaSh = newCatalinaSh.replace(" eval \"\\\"$_RUNJAVA\\\"\"
\"$JAVA_OPTS\" \\\n" +
+ " -classpath \"\\\"$CATALINA_HOME/lib/catalina.jar\\\"\"
\\\n" +
+ " org.apache.catalina.util.ServerInfo",
+ " eval \"\\\"$_RUNJAVA\\\"\" \"$JAVA_OPTS\" \\\n" +
+ " -classpath
\"\\\"$CATALINA_HOME/lib/catalina.jar:$CATALINA_HOME/lib/openejb-core-"+
properties.get("tomee.version") + ".jar\\\"\" \\\n" +
+ " org.apache.catalina.util.ServerInfo");
// overwrite the catalina.sh file
if (Installers.writeAll(paths.getCatalinaShFile(), newCatalinaSh,
alerts)) {
@@ -693,11 +693,9 @@ public class Installer implements InstallerInterface {
"\r\n" +
"rem ----- Execute The Requested Command");
- newCatalinaBat.replace(":doVersion\n" +
- "%_EXECJAVA% -classpath \"%CATALINA_HOME%\\lib\\catalina.jar\"
org.apache.catalina.util.ServerInfo\n" +
- "goto end", ":doVersion\n" +
- "%_EXECJAVA% -classpath
\"%CATALINA_HOME%\\lib\\catalina.jar;%CATALINA_HOME%\\lib\\openejb-core-" +
properties.get("tomee.version") + ".jar\"
org.apache.catalina.util.ServerInfo\n" +
- "goto end");
+ newCatalinaBat = newCatalinaBat.replace("%_EXECJAVA% %JAVA_OPTS%
-classpath \"%CATALINA_HOME%\\lib\\catalina.jar\"
org.apache.catalina.util.ServerInfo",
+ "%_EXECJAVA% %JAVA_OPTS% -classpath
\"%CATALINA_HOME%\\lib\\catalina.jar;%CATALINA_HOME%\\lib\\openejb-core-" +
properties.get("tomee.version") + ".jar\" org.apache.catalina.util.ServerInfo");
+
// overwrite the catalina.bat file
if (Installers.writeAll(paths.getCatalinaBatFile(), newCatalinaBat,
alerts)) {
alerts.addInfo("Add OpenEJB JavaAgent to catalina.bat");
