This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-tck.git
The following commit(s) were added to refs/heads/main by this push:
new 6c56f7a Update arquillian-tomcat-embedded-10 to 1.2.3
6c56f7a is described below
commit 6c56f7a8e31511c25b5ebbd86b035d54f2616c31
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jan 19 17:27:54 2026 +0000
Update arquillian-tomcat-embedded-10 to 1.2.3
This required some changes to the way the test harness configures the
TLS.
---
pom.xml | 2 +-
.../tomcat/tck/servlet/TomcatServletTckConfiguration.java | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9be47ee..a4f2db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<!-- TCK dependency versions -->
<tck.common.version>11.1.1-M2</tck.common.version>
<arquillian.version>1.10.0.Final</arquillian.version>
- <arquillian.tomcat.version>1.2.0.Final</arquillian.tomcat.version>
+ <arquillian.tomcat.version>1.2.2.Final</arquillian.tomcat.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<failsafe.plugin.version>3.5.4</failsafe.plugin.version>
diff --git
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
index 7c1ee5d..5e3d2a2 100644
---
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
+++
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
@@ -62,7 +62,6 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
tomcatField.setAccessible(true);
Tomcat tomcat = (Tomcat) tomcatField.get(container);
Connector connectorHttp = tomcat.getConnector();
- int localPort;
if ("https".equals(System.getProperty("arquillian.launch"))) {
// Need to enabled HTTPS - only used for client-cert tests
@@ -92,8 +91,9 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
this.getClass().getResource("/localhost-rsa.jks").toExternalForm());
certificateConfig.setCertificateKeystorePassword("changeit");
+ // Arquillian expects Tomcat to have a single connector
+ tomcat.getService().removeConnector(connectorHttp);
tomcat.getService().addConnector(connectorHttps);
- localPort = connectorHttps.getLocalPort();
// Configure the client
// Copy the client certificate from the TCK JAR
@@ -119,7 +119,6 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
// Add trailer headers used in TCK to allow list
connectorHttp.setProperty("allowedTrailerHeaders",
"myTrailer,myTrailer2");
- localPort = connectorHttp.getLocalPort();
// Add expected users
tomcat.addUser("j2ee", "j2ee");
@@ -130,13 +129,6 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
tomcat.addRole("javajoe", "Manager");
}
- // Update Arquillian configuration with port being used by
Tomcat
- Field configurationField =
Tomcat10EmbeddedContainer.class.getDeclaredField("configuration");
- configurationField.setAccessible(true);
- Object configuration = configurationField.get(container);
- Field portField =
container.getConfigurationClass().getDeclaredField("bindHttpPort");
- portField.setAccessible(true);
- portField.set(configuration, Integer.valueOf(localPort));
} catch (Exception e) {
throw new RuntimeException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
