Tomcat TCK update Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java b/core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java index 46446a4..7bea8f7 100644 --- a/core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java +++ b/core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java
@@ -172,7 +172,8 @@ */ public InboundMessageContext(Configuration configuration, MultivaluedMap<String, String> httpHeaders, boolean translateNce) { super(configuration); - this.headers = new GuardianStringKeyMultivaluedMap<>(httpHeaders); + this.headers = new GuardianStringKeyMultivaluedMap<>(HeaderUtils.createInbound()); + this.headers(httpHeaders); this.entityContent = new EntityContent(); this.translateNce = translateNce; this.configuration = configuration;
diff --git a/tests/jersey-tck/pom.tomcat.xml b/tests/jersey-tck/pom.tomcat.xml index a6e71a9..056d5a0 100644 --- a/tests/jersey-tck/pom.tomcat.xml +++ b/tests/jersey-tck/pom.tomcat.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2024, 2025 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -32,7 +32,7 @@ <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <jersey.version>4.0.99-SNAPSHOT</jersey.version> <!-- the public version that pass the tck --> - <tomcat.container.version>11.0.0-M18</tomcat.container.version> + <tomcat.container.version>11.0.10</tomcat.container.version> <tomcat.home>${project.build.directory}/apache-tomcat-${tomcat.container.version}</tomcat.home> <tomcat.modules>${tomcat.home}/lib</tomcat.modules> <jakarta.platform.version>10.0.0</jakarta.platform.version> @@ -92,7 +92,7 @@ <dependency> <groupId>org.jboss.arquillian.container</groupId> <artifactId>arquillian-tomcat-managed-10</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.4.Final-SNAPSHOT</version> </dependency> <dependency> @@ -487,15 +487,6 @@ </artifactItem> <artifactItem> <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <version>${jersey.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${tomcat.modules}</outputDirectory> - <destFileName>jersey-container-servlet-core.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> <version>${jersey.version}</version> <type>jar</type>