From 7a5af43fbd9b7349ddbb22138bc57f55ee7b7ca8 Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Tue, 22 Feb 2022 09:29:48 -0500
Subject: [PATCH 1/2] Update TLD Attributes

---
 impl/src/main/resources/META-INF/c.tld   | 6 +++---
 impl/src/main/resources/META-INF/fmt.tld | 6 +++---
 impl/src/main/resources/META-INF/fn.tld  | 6 +++---
 impl/src/main/resources/META-INF/sql.tld | 6 +++---
 impl/src/main/resources/META-INF/x.tld   | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/impl/src/main/resources/META-INF/c.tld b/impl/src/main/resources/META-INF/c.tld
index 2661efa5..c3229425 100644
--- a/impl/src/main/resources/META-INF/c.tld
+++ b/impl/src/main/resources/META-INF/c.tld
@@ -22,9 +22,9 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
     version="2.1">
     
-  <description>JSTL 1.2 core library</description>
-  <display-name>JSTL core</display-name>
-  <tlib-version>1.2</tlib-version>
+  <description>Tags 3.0 core library</description>
+  <display-name>Tags core</display-name>
+  <tlib-version>3.0</tlib-version>
   <short-name>c</short-name>
   <uri>jakarta.tags.core</uri>
 
diff --git a/impl/src/main/resources/META-INF/fmt.tld b/impl/src/main/resources/META-INF/fmt.tld
index d80fa985..731f39fd 100644
--- a/impl/src/main/resources/META-INF/fmt.tld
+++ b/impl/src/main/resources/META-INF/fmt.tld
@@ -22,9 +22,9 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
     version="2.0">
     
-  <description>JSTL 1.1 i18n-capable formatting library</description>
-  <display-name>JSTL fmt</display-name>
-  <tlib-version>1.1</tlib-version>
+  <description>Tags 3.0 i18n-capable formatting library</description>
+  <display-name>Tags fmt</display-name>
+  <tlib-version>3.0</tlib-version>
   <short-name>fmt</short-name>
   <uri>jakarta.tags.fmt</uri>
 
diff --git a/impl/src/main/resources/META-INF/fn.tld b/impl/src/main/resources/META-INF/fn.tld
index 94cc50d9..8b8eac29 100644
--- a/impl/src/main/resources/META-INF/fn.tld
+++ b/impl/src/main/resources/META-INF/fn.tld
@@ -22,9 +22,9 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
     
-  <description>JSTL 1.1 functions library</description>
-  <display-name>JSTL functions</display-name>
-  <tlib-version>1.1</tlib-version>
+  <description>Tags 3.0 functions library</description>
+  <display-name>Tags functions</display-name>
+  <tlib-version>3.0</tlib-version>
   <short-name>fn</short-name>
   <uri>jakarta.tags.functions</uri>
 
diff --git a/impl/src/main/resources/META-INF/sql.tld b/impl/src/main/resources/META-INF/sql.tld
index de20b7c9..f53bfd01 100644
--- a/impl/src/main/resources/META-INF/sql.tld
+++ b/impl/src/main/resources/META-INF/sql.tld
@@ -22,9 +22,9 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
     version="2.0">
     
-  <description>JSTL 1.1 sql library</description>
-  <display-name>JSTL sql</display-name>
-  <tlib-version>1.1</tlib-version>
+  <description>Tags 3.0 sql library</description>
+  <display-name>Tags sql</display-name>
+  <tlib-version>3.0</tlib-version>
   <short-name>sql</short-name>
   <uri>jakarta.tags.sql</uri>
 
diff --git a/impl/src/main/resources/META-INF/x.tld b/impl/src/main/resources/META-INF/x.tld
index 3d3c9489..7beddaff 100644
--- a/impl/src/main/resources/META-INF/x.tld
+++ b/impl/src/main/resources/META-INF/x.tld
@@ -22,9 +22,9 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
     version="2.0">
     
-  <description>JSTL 1.1 XML library</description>
-  <display-name>JSTL XML</display-name>
-  <tlib-version>1.1</tlib-version>
+  <description>Tags 3.0 XML library</description>
+  <display-name>Tags XML</display-name>
+  <tlib-version>3.0</tlib-version>
   <short-name>x</short-name>
   <uri>jakarta.tags.xml</uri>
 

From d1e2afb77d64fcded03fa2828b9ea2e284d0a4eb Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Wed, 23 Feb 2022 14:54:57 -0500
Subject: [PATCH 2/2] Update copyrights

---
 impl/src/main/resources/META-INF/c.tld   | 3 ++-
 impl/src/main/resources/META-INF/fmt.tld | 3 ++-
 impl/src/main/resources/META-INF/fn.tld  | 3 ++-
 impl/src/main/resources/META-INF/sql.tld | 3 ++-
 impl/src/main/resources/META-INF/x.tld   | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/impl/src/main/resources/META-INF/c.tld b/impl/src/main/resources/META-INF/c.tld
index c3229425..e27b9593 100644
--- a/impl/src/main/resources/META-INF/c.tld
+++ b/impl/src/main/resources/META-INF/c.tld
@@ -2,7 +2,8 @@
 <!--
 
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
-
+    Copyright (c) 2022-2022 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.
diff --git a/impl/src/main/resources/META-INF/fmt.tld b/impl/src/main/resources/META-INF/fmt.tld
index 731f39fd..24fae58f 100644
--- a/impl/src/main/resources/META-INF/fmt.tld
+++ b/impl/src/main/resources/META-INF/fmt.tld
@@ -2,7 +2,8 @@
 <!--
 
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
-
+    Copyright (c) 2022-2022 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.
diff --git a/impl/src/main/resources/META-INF/fn.tld b/impl/src/main/resources/META-INF/fn.tld
index 8b8eac29..07298cd3 100644
--- a/impl/src/main/resources/META-INF/fn.tld
+++ b/impl/src/main/resources/META-INF/fn.tld
@@ -2,7 +2,8 @@
 <!--
 
     Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
+    Copyright (c) 2022-2022 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.
diff --git a/impl/src/main/resources/META-INF/sql.tld b/impl/src/main/resources/META-INF/sql.tld
index f53bfd01..ea657456 100644
--- a/impl/src/main/resources/META-INF/sql.tld
+++ b/impl/src/main/resources/META-INF/sql.tld
@@ -2,7 +2,8 @@
 <!--
 
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
-
+    Copyright (c) 2022-2022 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.
diff --git a/impl/src/main/resources/META-INF/x.tld b/impl/src/main/resources/META-INF/x.tld
index 7beddaff..58d5cde9 100644
--- a/impl/src/main/resources/META-INF/x.tld
+++ b/impl/src/main/resources/META-INF/x.tld
@@ -2,7 +2,8 @@
 <!--
 
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
-
+    Copyright (c) 2022-2022 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.