diff --git a/NOTICE b/NOTICE
index 84982101a38603d155075ac60d8661a1c6fc621e..85c850a6973b0c1558848471b614b82b213ea195 100644
--- a/NOTICE
+++ b/NOTICE
@@ -80,7 +80,7 @@ The following software have components provided under the terms of this license:
 - GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
 - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
 - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
-- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core)
+- Google Cloud Core (from https://github.com/googleapis/java-core)
 - Google Cloud Core HTTP (from https://github.com/googleapis/java-core)
 - Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc)
 - Google Cloud Datastore (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore)
@@ -124,7 +124,7 @@ The following software have components provided under the terms of this license:
 - Jackson (from http://jackson.codehaus.org)
 - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2)
 - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
-- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
+- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310)
 - Jackson datatype: Joda (from https://github.com/FasterXML/jackson-datatype-joda)
 - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
 - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson)
@@ -164,8 +164,8 @@ The following software have components provided under the terms of this license:
 - Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
 - Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
 - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
 - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
+- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
 - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
 - Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
 - Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
@@ -238,10 +238,8 @@ The following software have components provided under the terms of this license:
 - SnakeYAML (from http://www.snakeyaml.org)
 - Spring AOP (from https://github.com/spring-projects/spring-framework)
 - Spring Beans (from https://github.com/spring-projects/spring-framework)
-- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2)
+- Spring Boot Log4j 2 Starter (from http://projects.spring.io/spring-boot/)
 - Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat)
-- Spring Boot Undertow Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-undertow)
-- Spring Boot Undertow Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-undertow)
 - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
 - Spring Context (from https://github.com/spring-projects/spring-framework)
 - Spring Core (from https://github.com/spring-projects/spring-framework)
@@ -278,13 +276,11 @@ The following software have components provided under the terms of this license:
 - aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
 - asm (from http://asm.ow2.io/)
 - aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client)
+- cli (from https://github.com/elastic/elasticsearch)
 - com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis)
 - compiler (from http://github.com/spullara/mustache.java)
+- core (from https://github.com/elastic/elasticsearch)
 - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client)
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
 - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
 - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
 - grpc-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/grpc-google-cloud-pubsub-v1)
@@ -328,7 +324,7 @@ The following software have components provided under the terms of this license:
 - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
 - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/)
 - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
-- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
+- org.xmlunit:xmlunit-core (from https://www.xmlunit.org/)
 - parent-join (from https://github.com/elastic/elasticsearch)
 - perfmark:perfmark-api (from https://github.com/perfmark/perfmark)
 - powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common)
@@ -343,14 +339,15 @@ The following software have components provided under the terms of this license:
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://resilience4j.readme.io)
-- resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://resilience4j.readme.io)
 - rest (from https://github.com/elastic/elasticsearch)
 - rest-high-level (from https://github.com/elastic/elasticsearch)
 - rxjava (from https://github.com/ReactiveX/RxJava)
+- secure-sm (from https://github.com/elastic/elasticsearch)
 - server (from https://github.com/elastic/elasticsearch)
 - spring-boot (from https://spring.io/projects/spring-boot)
 - spring-boot-actuator (from https://spring.io/projects/spring-boot)
@@ -365,6 +362,8 @@ The following software have components provided under the terms of this license:
 - spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-security (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-test (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-undertow (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-undertow (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
 - spring-boot-starter-web (from https://spring.io/projects/spring-boot)
@@ -372,14 +371,14 @@ The following software have components provided under the terms of this license:
 - spring-boot-starter-webflux (from https://spring.io/projects/spring-boot)
 - spring-boot-test (from https://spring.io/projects/spring-boot)
 - spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot)
-- spring-security-config (from https://spring.io/projects/spring-security)
-- spring-security-config (from https://spring.io/projects/spring-security)
-- spring-security-core (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-core (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-jose (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security)
-- spring-security-web (from https://spring.io/projects/spring-security)
-- spring-security-web (from https://spring.io/projects/spring-security)
+- spring-security-config (from http://spring.io/spring-security)
+- spring-security-config (from http://spring.io/spring-security)
+- spring-security-core (from http://spring.io/spring-security)
+- spring-security-oauth2-core (from http://spring.io/spring-security)
+- spring-security-oauth2-jose (from http://spring.io/spring-security)
+- spring-security-oauth2-resource-server (from http://spring.io/spring-security)
+- spring-security-web (from http://spring.io/spring-security)
+- spring-security-web (from http://spring.io/spring-security)
 - springfox-core (from https://github.com/springfox/springfox)
 - springfox-schema (from https://github.com/springfox/springfox)
 - springfox-spi (from https://github.com/springfox/springfox)
@@ -394,6 +393,7 @@ The following software have components provided under the terms of this license:
 - tomcat-embed-el (from https://tomcat.apache.org/)
 - tomcat-embed-websocket (from https://tomcat.apache.org/)
 - wildfly-common (from )
+- x-content (from https://github.com/elastic/elasticsearch)
 
 ========================================================================
 BSD-2-Clause
@@ -470,9 +470,9 @@ CDDL-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- JAXB RI (from https://jaxb.dev.java.net/)
 - JavaBeans Activation Framework API jar (from )
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/)
 
 ========================================================================
 CDDL-1.1
@@ -558,12 +558,12 @@ The following software have components provided under the terms of this license:
 
 - Common Annotations 1.2 API (from )
 - Expression Language 3.0 (from http://uel.java.net)
+- JAXB RI (from https://jaxb.dev.java.net/)
 - Java Servlet 4.0 API (from )
 - Java Servlet API (from http://servlet-spec.java.net)
 - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - JavaBeans Activation Framework (from )
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 - jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
@@ -584,6 +584,7 @@ The following software have components provided under the terms of this license:
 - Checker Qual (from https://checkerframework.org)
 - Common Annotations 1.3 API (from )
 - Expression Language 3.0 (from http://uel.java.net)
+- JAXB RI (from https://jaxb.dev.java.net/)
 - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el)
 - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Java Servlet 4.0 API (from )
@@ -593,7 +594,6 @@ The following software have components provided under the terms of this license:
 - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - JavaBeans Activation Framework (from )
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 - jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - jaxb-api (from https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
@@ -605,13 +605,13 @@ GPL-3.0-only
 The following software have components provided under the terms of this license:
 
 - Common Annotations 1.3 API (from )
+- JAXB RI (from https://jaxb.dev.java.net/)
 - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el)
 - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Java Servlet 4.0 API (from )
 - Java Servlet 4.0 API (from )
 - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/)
 - Project Lombok (from https://projectlombok.org)
 
 ========================================================================
@@ -722,7 +722,7 @@ The following software have components provided under the terms of this license:
 - mockito-junit-jupiter (from https://github.com/mockito/mockito)
 - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
 - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
-- spring-security-core (from https://spring.io/projects/spring-security)
+- spring-security-core (from http://spring.io/spring-security)
 
 ========================================================================
 MPL-1.1
@@ -753,8 +753,8 @@ Public-Domain
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- JAXB RI (from https://jaxb.dev.java.net/)
 - Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/)
 - Spongy Castle (from http://rtyley.github.io/spongycastle/)
 
 ========================================================================