Skip to content

Commit ba65258

Browse files
committed
Tomcat TCK update
Signed-off-by: Maxim Nesen <[email protected]>
1 parent e45ecd7 commit ba65258

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ public InboundMessageContext(Configuration configuration, boolean translateNce)
172172
*/
173173
public InboundMessageContext(Configuration configuration, MultivaluedMap<String, String> httpHeaders, boolean translateNce) {
174174
super(configuration);
175-
this.headers = new GuardianStringKeyMultivaluedMap<>(httpHeaders);
175+
this.headers = new GuardianStringKeyMultivaluedMap<>(HeaderUtils.createInbound());
176+
this.headers(httpHeaders);
176177
this.entityContent = new EntityContent();
177178
this.translateNce = translateNce;
178179
this.configuration = configuration;

tests/jersey-tck/pom.tomcat.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!--
33
4-
Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2024, 2025 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,7 +32,7 @@
3232
<maven.compiler.source>11</maven.compiler.source>
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<jersey.version>4.0.99-SNAPSHOT</jersey.version> <!-- the public version that pass the tck -->
35-
<tomcat.container.version>11.0.0-M18</tomcat.container.version>
35+
<tomcat.container.version>11.0.10</tomcat.container.version>
3636
<tomcat.home>${project.build.directory}/apache-tomcat-${tomcat.container.version}</tomcat.home>
3737
<tomcat.modules>${tomcat.home}/lib</tomcat.modules>
3838
<jakarta.platform.version>10.0.0</jakarta.platform.version>
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>org.jboss.arquillian.container</groupId>
9494
<artifactId>arquillian-tomcat-managed-10</artifactId>
95-
<version>1.2.1-SNAPSHOT</version>
95+
<version>1.2.4.Final-SNAPSHOT</version>
9696
</dependency>
9797

9898
<dependency>
@@ -485,15 +485,6 @@
485485
<outputDirectory>${tomcat.modules}</outputDirectory>
486486
<destFileName>jersey-container-grizzly2-servlet.jar</destFileName>
487487
</artifactItem>
488-
<artifactItem>
489-
<groupId>org.glassfish.jersey.containers</groupId>
490-
<artifactId>jersey-container-servlet-core</artifactId>
491-
<version>${jersey.version}</version>
492-
<type>jar</type>
493-
<overWrite>true</overWrite>
494-
<outputDirectory>${tomcat.modules}</outputDirectory>
495-
<destFileName>jersey-container-servlet-core.jar</destFileName>
496-
</artifactItem>
497488
<artifactItem>
498489
<groupId>org.glassfish.jersey.containers</groupId>
499490
<artifactId>jersey-container-servlet</artifactId>

0 commit comments

Comments
 (0)