Merge pull request #1557 from brideck/ExcludeServletMaxAgeTest

Exclude Servlet Cookie setMaxAgeZeroTest
jakartaee · Oct 3, 2024 · ad42410 · ad42410
2 parents ab53e00 + e49fbcb
commit ad42410
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/install/jakartaee/bin/ts.jtx b/install/jakartaee/bin/ts.jtx
@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-# Exclude list for Jakarta EE TCK 9  
+# Exclude list for Jakarta EE TCK 10 
 
 ################
 # JSF
@@ -233,6 +233,10 @@ com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java#setMaxAg
 # https://github.com/jakartaee/servlet/issues/472 TCK Challenge: doHeadTest shouldn't validate optional payload header fields
 com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest/URLClient.java#doHeadTest
 
+# https://github.com/jakartaee/servlet/issues/701 TCK Challenge: setMaxAgeZeroTest() expects different Max-Age between EE10 and EE11
+com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java#setMaxAgeZeroTest
+com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java#setMaxAgeZeroTest
+
 # https://github.com/jakartaee/platform-tck/issues/1313
 com/sun/ts/tests/servlet/compat/LeadingSlash/WithoutLeadingSlash/URLClient.java#WithoutLeadingSlashTest
 
diff --git a/install/servlet/bin/ts.jtx b/install/servlet/bin/ts.jtx
@@ -1,6 +1,6 @@
 #
-# Copyright (c) 2009, 2021 Oracle and/or its affiliates and others.
-# All rights reserved.
+# Copyright (c) 2009, 2021 Oracle and/or its affiliates and others. All rights reserved.
+# Copyright (c) 2024 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,3 +27,7 @@ com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java#setMaxAg
 # https://github.com/jakartaee/servlet/issues/472 TCK Challenge: doHeadTest shouldn't validate optional payload header fields
 com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest/URLClient.java#doHeadTest
 
+# https://github.com/jakartaee/servlet/issues/701 TCK Challenge: setMaxAgeZeroTest() expects different Max-Age between EE10 and EE11
+com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java#setMaxAgeZeroTest
+com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java#setMaxAgeZeroTest
+
diff --git a/release/tools/servlet.xml b/release/tools/servlet.xml
@@ -23,7 +23,7 @@
 	<import file="../../bin/xml/ts.common.props.xml"/>
 
 	<property name="deliverable.version"  value="6.0"/>
-        <property name="deliverable.tck.version"  value="6.0.2"/>
+        <property name="deliverable.tck.version"  value="6.0.3"/>
 
 	<target name="init">
 		<mkdir dir="${deliverable.bundle.dir}/bin"/>