diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
index e0ae2e9de4..8cfa07d562 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
index 37dff4106d..ca454d11e4 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
index 120da961f5..aa657f1231 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
index 69a11dfd8e..0da2a3941b 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
index c6263b7a29..7ab5042448 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
index 7da395fff2..a9a25df4c4 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
index a21177556d..8cd4accc37 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
index c5f3b8da2a..58da89ff39 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
index d6499278c6..8e1d9de2f7 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
index 60f59f2b29..a750507fd4 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation.
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
index 798e9f72e3..41c6e7d79e 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
index e5963968f5..733c2ba079 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
index a47e9409b3..41a7a30f6a 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
index fc793329e4..cc62a0da1f 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
index 4b383fd29d..0d206a178a 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
index 851b6542c4..cdfb848203 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
index a05122977b..46e9dbfb33 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf
index a2dce1d66d..81adbaeb44 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf
@@ -11,13 +11,14 @@
 
     <!-- The fallbackLocale configuration variable will be
              used if no locale match can be determined. -->
-
-
-
+    
+    
+    
     Nov 21, 2000<br>
     3:45:02 AM<br>
-    Nov 21, 2000, 3:45:02 AM<br>
+    Nov 21, 2000, 3:45:02 AM<br>
 
 </body>
 </html>
 
+
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
index 6d3bbdf812..d31a5db717 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -37,4 +38,4 @@
     <fmt:formatDate value="${r1}" timeZone="EST"/><br>
     <fmt:formatDate value="${r2}" timeZone="EST" type="time"/><br>
     <fmt:formatDate value="${r3}" timeZone="EST" type="both"/><br>
-</tck:test>
\ No newline at end of file
+</tck:test>
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf
index 0fde7b84d0..259a773997 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf
@@ -4,7 +4,6 @@
 
 
 
-
 <html>
 <head><title>positivePDLocalizationContextTest</title></head>
 <body>
@@ -12,16 +11,15 @@
     <!-- Validate that the action is able to dermine the
              formatting locale based on the localizationContext configuration
              variable. -->
-
-
-
+    
+    
+    
     Nov 21, 2000<br>
     3:45:02 AM<br>
-    Nov 21, 2000, 3:45:02 AM<br>
+    Nov 21, 2000, 3:45:02 AM<br>
 
 
 </body>
 </html>
 
 
-
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
index d6f2773bee..3a6a2d14c2 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
index ab9a415d19..d78daa599a 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -40,4 +41,4 @@
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
                       parseLocale='<%= (Locale) pageContext.getAttribute("loc") %>' type="both"/><br>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' parseLocale="en_US" type="both"/><br>
-</tck:test>
\ No newline at end of file
+</tck:test>
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
index 7ecfb238e3..590312817a 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
index 657256a062..f2ade709b0 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2003 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2003, 2021 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf
index 14b86c26bb..fad4227e97 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf
@@ -12,11 +12,12 @@
     <!-- If timeZone is null or empty, it will be treated as
              if it was not present (only type short times is specified
              as any other style has no impact on the result). -->
-
-
-    Nov 21, 2000, 5:45 AM<br>
-    Nov 21, 2000, 5:45 AM<br>
+    
+    
+    Nov 21, 2000, 5:45 AM<br>
+    Nov 21, 2000, 5:45 AM<br>
 
 </body>
 </html>
 
+
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
index c87b3da374..adab105ffd 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -35,4 +36,4 @@
                        timeZone="" type="both" timeStyle="short" var="re1"/>
     <fmt:formatDate value="${rn1}" timeZone="EST" type="both" timeStyle="short"/><br>
     <fmt:formatDate value="${re1}" timeZone="EST" type="both" timeStyle="short"/><br>
-</tck:test>
\ No newline at end of file
+</tck:test>
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
index 274216a61f..b388777d59 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
@@ -21,24 +21,25 @@
       
         
       
-      Nov 21, 2000, 6:45 AM<br>
+      Nov 21, 2000, 6:45 AM<br>
 
       Not wrapped.  Page has a time zone of EST, timeZone attribute specified.  Time should be offset by 3 hours:<br>
       <br>
-      Nov 21, 2000, 6:45 AM<br>
+      Nov 21, 2000, 6:45 AM<br>
 
     <br>No TimeZone attribute specified:<br>
       Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 2 hours:<br>
       
         <br>
       
-      Nov 21, 2000, 5:45 AM<br>
+      Nov 21, 2000, 5:45 AM<br>
       
       Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
       <br>
-      Nov 21, 2000, 3:45 AM<br>
+      Nov 21, 2000, 3:45 AM<br>
     <br>
 
 </body>
 </html>
 
+
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
index 44cd84afdc..c41520f42e 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -51,7 +52,7 @@
         <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd3"/><br>
       </fmt:timeZone>
       <fmt:formatDate value="${rd3}" timeZone="EST" type="both" timeStyle="short"/><br>
-
+      
       Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
       <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd4"/><br>
       <fmt:formatDate value="${rd4}" timeZone="EST" type="both" timeStyle="short"/><br>
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
index a093d2764f..f6c3e4fa8f 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
@@ -13,13 +13,14 @@
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
     <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be offset 3 hours.<br>
-
-
-
-    No timeZone attribute: Nov 21, 2000, 3:45 AM<br>
-    Nov 21, 2000, 6:45 AM<br>
-    Nov 21, 2000, 6:45 AM<br>
+    
+    
+    
+    No timeZone attribute: Nov 21, 2000, 3:45 AM<br>
+    Nov 21, 2000, 6:45 AM<br>
+    Nov 21, 2000, 6:45 AM<br>
 
 </body>
 </html>
 
+
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
index 551dda38cb..7a8aa42a17 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
@@ -1,4 +1,6 @@
 <%--
+
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -10,8 +12,9 @@
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
     https://www.gnu.org/software/classpath/license.html.
-    
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
 --%>
 
 <%@ page pageEncoding="UTF-8"%>
@@ -40,4 +43,4 @@
     No timeZone attribute: <fmt:formatDate value="${rdef}" timeZone="EST" type="both" timeStyle="short"/><br>
     <fmt:formatDate value="${rpst1}" timeZone="EST" type="both" timeStyle="short"/><br>
     <fmt:formatDate value="${rpst2}" timeZone="EST" type="both" timeStyle="short"/><br>
-</tck:test>
\ No newline at end of file
+</tck:test>
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.gf b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.gf
index 8fde308873..66d7167b49 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.gf
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.gf
@@ -4,31 +4,29 @@
 
 
 
-
 <html>
 <head><title>positivePDTypeTest</title></head>
 <body>
 
     <!-- the type attribute specifies the the type of date
              information is contained in the value to be parsed. -->
-
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
     date: Nov 21, 2000<br>
     date: Nov 21, 2000<br>
     date: Nov 21, 2000<br>
-    time: 3:45:02 AM<br>
-    time: 3:45:02 AM<br>
-    both: Nov 21, 2000, 3:45:02 AM<br>
-    both: Nov 21, 2000, 3:45:02 AM<br>
-
+    time: 3:45:02 AM<br>
+    time: 3:45:02 AM<br>
+    both: Nov 21, 2000, 3:45:02 AM<br>
+    both: Nov 21, 2000, 3:45:02 AM<br>
+    
 
 </body>
 </html>
 
 
-
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp
index 4b55ad1516..dd83749cad 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTypeTestJava20Plus.jsp
@@ -1,10 +1,12 @@
 <%--
+
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. 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
     http://www.eclipse.org/legal/epl-2.0.
-    
+
     This Source Code may also be made available under the following Secondary
     Licenses when the conditions for such availability set forth in the
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
@@ -12,6 +14,7 @@
     https://www.gnu.org/software/classpath/license.html.
 
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
 --%>
 
 <%@ page pageEncoding="UTF-8"%>
@@ -51,5 +54,5 @@
     time: <fmt:formatDate value="${r5}" type="time"/><br>
     both: <fmt:formatDate value="${r6}" type="both"/><br>
     both: <fmt:formatDate value="${r7}" type="both"/><br>
-
-</tck:test>
\ No newline at end of file
+    
+</tck:test>
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueNullEmptyTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueNullEmptyTest.jsp
index 5855b5068c..36b6b3b960 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueNullEmptyTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueNullEmptyTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp
index dd8354c5eb..e46c26ca99 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/settimezone/positiveSetTimezoneValueTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueNullEmptyTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueNullEmptyTest.jsp
index 446f7d41f0..c707b0c72a 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueNullEmptyTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueNullEmptyTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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
diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp
index bfd364a3fa..49b21d3f74 100644
--- a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp
+++ b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/timezone/positiveTimezoneValueTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. 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