diff --git a/api/etc/config/copyright-exclude b/api/etc/config/copyright-exclude
new file mode 100755
index 00000000..0652199c
--- /dev/null
+++ b/api/etc/config/copyright-exclude
@@ -0,0 +1,7 @@
+speclicense.html
+/etc/config/copyright-exclude
+/etc/config/copyright.txt
+/src/main/javadoc/jakarta/servlet/jsp/tagext/doc-files/BodyTagProtocol.gif
+/src/main/javadoc/jakarta/servlet/jsp/tagext/doc-files/TagProtocol.gif
+/src/main/javadoc/jakarta/servlet/jsp/tagext/doc-files/VariableInfo-1.gif
+/src/main/javadoc/jakarta/servlet/jsp/tagext/doc-files/IterationTagProtocol.gif
diff --git a/api/etc/config/copyright.txt b/api/etc/config/copyright.txt
new file mode 100755
index 00000000..0bf589f2
--- /dev/null
+++ b/api/etc/config/copyright.txt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) YYYY Oracle and/or its affiliates and others.
+ * 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
+ * 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,
+ * 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
+ */
+
diff --git a/api/pom.xml b/api/pom.xml
index 393462b4..77c80234 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
+    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/api/src/main/java/jakarta/servlet/jsp/ErrorData.java b/api/src/main/java/jakarta/servlet/jsp/ErrorData.java
index f76c2a6f..fb35d539 100644
--- a/api/src/main/java/jakarta/servlet/jsp/ErrorData.java
+++ b/api/src/main/java/jakarta/servlet/jsp/ErrorData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java b/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java
index b91f3a68..46e41c84 100644
--- a/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java
+++ b/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java b/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java
index 2eeaf165..506e1325 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspContext.java b/api/src/main/java/jakarta/servlet/jsp/JspContext.java
index edac4b0d..691db939 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspContext.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspEngineInfo.java b/api/src/main/java/jakarta/servlet/jsp/JspEngineInfo.java
index 960bc97d..4d19a263 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspEngineInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspEngineInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspException.java b/api/src/main/java/jakarta/servlet/jsp/JspException.java
index 3578a8c1..c3ce15d4 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspException.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspFactory.java b/api/src/main/java/jakarta/servlet/jsp/JspFactory.java
index 7e850c15..8a5ab964 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspFactory.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspPage.java b/api/src/main/java/jakarta/servlet/jsp/JspPage.java
index a527f4cf..e84edc6a 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspPage.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspTagException.java b/api/src/main/java/jakarta/servlet/jsp/JspTagException.java
index b7c99feb..6f1dcca3 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspTagException.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspTagException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspWriter.java b/api/src/main/java/jakarta/servlet/jsp/JspWriter.java
index 4ae3bc89..71d21bbf 100644
--- a/api/src/main/java/jakarta/servlet/jsp/JspWriter.java
+++ b/api/src/main/java/jakarta/servlet/jsp/JspWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/PageContext.java b/api/src/main/java/jakarta/servlet/jsp/PageContext.java
index 20191493..561620ad 100644
--- a/api/src/main/java/jakarta/servlet/jsp/PageContext.java
+++ b/api/src/main/java/jakarta/servlet/jsp/PageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/SkipPageException.java b/api/src/main/java/jakarta/servlet/jsp/SkipPageException.java
index 373075fb..ed594c74 100644
--- a/api/src/main/java/jakarta/servlet/jsp/SkipPageException.java
+++ b/api/src/main/java/jakarta/servlet/jsp/SkipPageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ELException.java b/api/src/main/java/jakarta/servlet/jsp/el/ELException.java
index 87daf9c5..cd7ff132 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ELException.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ELException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ELParseException.java b/api/src/main/java/jakarta/servlet/jsp/el/ELParseException.java
index 6cb0ccfe..8eb93881 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ELParseException.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ELParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/Expression.java b/api/src/main/java/jakarta/servlet/jsp/el/Expression.java
index 63e158ba..c3df09fd 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/Expression.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java b/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
index 351ba378..e4cee00a 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/FunctionMapper.java b/api/src/main/java/jakarta/servlet/jsp/el/FunctionMapper.java
index 40781dac..34097932 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/FunctionMapper.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/FunctionMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
index 2684fe88..70ba0523 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
index deb7f4ff..2b288e15 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/VariableResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/VariableResolver.java
index bbf16bca..8e911779 100644
--- a/api/src/main/java/jakarta/servlet/jsp/el/VariableResolver.java
+++ b/api/src/main/java/jakarta/servlet/jsp/el/VariableResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyContent.java b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyContent.java
index fd70ca2d..f946a046 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyContent.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java
index a195f72b..df7976c4 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTagSupport.java b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTagSupport.java
index 89bee9c0..c82db3d3 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTagSupport.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTagSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java b/api/src/main/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java
index d228290f..db9b7fcf 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/FunctionInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/FunctionInfo.java
index 7ed9532b..f4049d4a 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/FunctionInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/FunctionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/IterationTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/IterationTag.java
index 0b6912df..835f54f1 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/IterationTag.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/IterationTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/JspFragment.java b/api/src/main/java/jakarta/servlet/jsp/tagext/JspFragment.java
index 1754ace1..c4b2b64f 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/JspFragment.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/JspFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java b/api/src/main/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java
index 4c13595f..b5aa3a14 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/JspTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/JspTag.java
index d83ccde5..1ab26975 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/JspTag.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/JspTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/PageData.java b/api/src/main/java/jakarta/servlet/jsp/tagext/PageData.java
index 36112fb1..ba87d964 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/PageData.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/PageData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTag.java
index 23ce3c7e..2909dbe8 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTag.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java b/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java
index b4cd7a7e..7c791dc4 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/SimpleTagSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/Tag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/Tag.java
index c6a9ce2b..04bf4979 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/Tag.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/Tag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagAdapter.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagAdapter.java
index 13ffd311..41fc7f65 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagAdapter.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagAttributeInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagAttributeInfo.java
index 6cbf377a..47d3ee75 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagAttributeInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagAttributeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagData.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagData.java
index c21ec4b5..75831981 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagData.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagExtraInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagExtraInfo.java
index 6ed42fd5..0542f36d 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagExtraInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagExtraInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagFileInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagFileInfo.java
index 541728cb..5b5bec86 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagFileInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagFileInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagInfo.java
index 0b28d656..fd8f3d2e 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryInfo.java
index 7042c9cb..0879ac1a 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryValidator.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryValidator.java
index f7123cc1..0bb85c9e 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryValidator.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagLibraryValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagSupport.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagSupport.java
index 27eda656..79c8a379 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagSupport.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagVariableInfo.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagVariableInfo.java
index 03e6d0d5..3ae133fb 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TagVariableInfo.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TagVariableInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TryCatchFinally.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TryCatchFinally.java
index f0bea60e..8dc50f7b 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/TryCatchFinally.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/TryCatchFinally.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/ValidationMessage.java b/api/src/main/java/jakarta/servlet/jsp/tagext/ValidationMessage.java
index 5296892d..4543b8e7 100644
--- a/api/src/main/java/jakarta/servlet/jsp/tagext/ValidationMessage.java
+++ b/api/src/main/java/jakarta/servlet/jsp/tagext/ValidationMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
diff --git a/api/src/main/javadoc/jakarta/servlet/jsp/el/package.html b/api/src/main/javadoc/jakarta/servlet/jsp/el/package.html
index b23af3d7..d8441ae0 100644
--- a/api/src/main/javadoc/jakarta/servlet/jsp/el/package.html
+++ b/api/src/main/javadoc/jakarta/servlet/jsp/el/package.html
@@ -1,6 +1,7 @@
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
+    All rights reserved.
     Copyright 2004 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +16,11 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
+-->
+<!-- 
     References in this document to JSP refer to the Jakarta Server Pages
     unless otherwise noted.
-
--->
-
+ -->
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>