[Releng] Update notice files

NOTICE.md

diff --git a/NOTICE.md b/NOTICE.md
index a2145e2..da3eeff 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -49,121 +49,125 @@
 
 This project leverages the following third party content:
 
+Java Servlet API 3.1
+  * License: CDDL, Apache-2.0
+
+Java Servlet API 4.0
+  * License: CDDL-1.1 AND Apache-2.0
+
 ICU4J 67.1
   * Project: http://site.icu-project.org
   * License: ICU AND Unicode-TOU AND BSD-3-Clause AND BSD-2-Clause AND
     LicenseRef-ipadic-license AND LicenseRef-Public-Domain
 
-Apache Derby (10.11.1.1)
+Apache Commons Logging 1.2
+  * Project: https://commons.apache.org/logging
+  * License: Apache-2.0
+
+Apache Commons DBCP 2.8
+  * Project: https://commons.apache.org/dbcp
+  * License: Apache-2.0
+
+Apache Commons Pool 2.9
+  * Project: https://commons.apache.org/pool
+  * License: Apache-2.0
+
+Apache Derby 10.11
   * Project: https://db.apache.org/derby
   * License: Apache-2.0
 
-Apache Commons DBCP (2.5.0)
-  * Project: https://commons.apache.org/proper/commons-dbcp
-  * License: Apache-2.0
-
-Apache Commons Pool (2.6.2)
-  * Project: https://commons.apache.org/proper/commons-pool
-  * License: Apache-2.0
-
-Apache Commons Logging (1.2)
-  * https://commons.apache.org/proper/commons-logging
-  * License: Apache-2.0
-
-Apache Lucene Core (7.5.0)
+Apache Lucene Core 7.5
   * Project: https://lucene.apache.org/core
   * License: Apache-2.0 AND MIT AND BSD-3-Clause
 
-Apache Lucene Analyzers Common (7.5.0)
+Apache Lucene Analyzers Common 7.5
   * Project: https://lucene.apache.org/core
   * License: Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause
 
-Apache Lucene QueryParsers (7.5.0)
+Apache Lucene Queries 7.5
   * Project: https://lucene.apache.org/core
   * License: Apache-2.0
 
-Apache Lucene Highlighter (7.5.0)
+Apache Lucene QueryParsers 7.5
   * Project: https://lucene.apache.org/core
   * License: Apache-2.0
 
-Apache Lucene Queries (7.5.0)
+Apache Lucene Highlighter 7.5
   * Project: https://lucene.apache.org/core
   * License: Apache-2.0
 
-Apache Lucene Join (7.5.0)
+Apache Lucene Join 7.5
   * Project: https://lucene.apache.org/core
   * License: Apache-2.0
 
-Java Servlet API (3.1.0)
-  * License: CDDL, Apache-2.0
-
-JSch (0.1.55)
-  * Project: https://www.jcraft.com/jsch
-  * License: New BSD license
-
-SnakeYAML (1.23)
-  * Project: https://bitbucket.org/asomov/snakeyaml
-  * License: Apache-2.0
-
-Google Guava (21.0)
+Google Guava 21.0
   * Project: https://github.com/google/guava
   * License: Apache-2.0 AND LicenseRef-Public-Domain
 
-Spring Web (5.1.16)
-  * Project: https://spring.io/projects/spring-framework
+SnakeYAML 1.23
+  * Project: https://bitbucket.org/asomov/snakeyaml
   * License: Apache-2.0
 
-Spring Core (5.1.16)
+SnakeYAML 1.26
+  * Project: https://bitbucket.org/asomov/snakeyaml
+  * License: Apache-2.0
+
+JSch 0.1.55
+  * Project: https://www.jcraft.com/jsch
+  * License: New BSD license
+
+Spring Core 5.2
   * Project: https://spring.io/projects/spring-framework
   * License: Apache-2.0 AND BSD-3-Clause
 
-Spring Beans (5.1.16)
+Spring Web 5.2
   * Project: https://spring.io/projects/spring-framework
   * License: Apache-2.0
 
-Spring Context (5.1.16)
+Spring AOP 5.2
   * Project: https://spring.io/projects/spring-framework
   * License: Apache-2.0
 
-Spring AOP (5.1.16)
+Spring Beans 5.2
   * Project: https://spring.io/projects/spring-framework
   * License: Apache-2.0
 
-Spring Expression Language (5.1.16)
+Spring Context 5.2
   * Project: https://spring.io/projects/spring-framework
   * License: Apache-2.0
 
-Spring Commons Logging Bridge (jcl) (5.1.16)
+Spring Expression Language 5.2
   * Project: https://spring.io/projects/spring-framework
   * License: Apache-2.0
 
-Spring Boot (2.1.15)
+Spring Commons Logging Bridge (jcl) 5.2
+  * Project: https://spring.io/projects/spring-framework
+  * License: Apache-2.0
+
+Spring Boot 2.3
   * Project: https://spring.io/projects/spring-boot
   * License: Apache-2.0
 
-Spring Boot AutoConfigure (2.1.15)
+Spring Boot AutoConfigure 2.3
   * Project: https://spring.io/projects/spring-boot
   * License: Apache-2.0
 
-SLF4J API (1.7.30)
+SLF4J API 1.7
   * Project: https://www.slf4j.org
   * License: MIT
 
-JUL to SLF4J Bridge (1.7.30)
+JUL to SLF4J Bridge 1.7
   * Project: https://www.slf4j.org
   * License: MIT
 
-Logback Core (1.2.3)
+Logback Core 1.2
   * Project: https://logback.qos.ch
   * License: EPL-1.0
 
-Logback Classic (1.2.3)
+Logback Classic 1.2
   * Project: https://logback.qos.ch
   * License: EPL-1.0
 
-Javax Annotation API (1.3.2)
-  * License: CDDL-1.1 OR GPL-2.0
-
 Java Unified Expression Language API (3.0.0)
   * License: CDDL, Apache-2.0