diff --git a/NOTICE b/NOTICE
index 32f59e449ca19ff041688b2a850ed2bdb9f682ac..540343197a8e5985bc2132ec3dd3b5b9baa249b6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,6 +2,13 @@
 Generated by fossa-cli (https://github.com/fossas/fossa-cli).
 This software includes the following software and licenses:
 
+========================================================================
+AML
+========================================================================
+The following software have components provided under the terms of this license:
+
+- SnakeYAML (from http://www.snakeyaml.org)
+
 ========================================================================
 Apache-2.0
 ========================================================================
@@ -74,7 +81,6 @@ The following software have components provided under the terms of this license:
 - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
 - Elastic JNA Distribution (from https://github.com/java-native-access/jna)
 - Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
-- Expression Language 3.0 (from http://uel.java.net)
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
 - Google APIs Client Library for Java (from )
@@ -83,7 +89,6 @@ The following software have components provided under the terms of this license:
 - Gson (from https://github.com/google/gson)
 - Gson (from https://github.com/google/gson)
 - Guava InternalFutureFailureAccess and InternalFutures (from )
-- Guava ListenableFuture only (from )
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - HPPC Collections (from http://labs.carrotsearch.com)
 - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
@@ -129,8 +134,8 @@ The following software have components provided under the terms of this license:
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Java Native Access (from https://github.com/java-native-access/jna)
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Java Servlet API (from http://servlet-spec.java.net)
+- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
 - Javassist (from http://www.javassist.org/)
 - Javassist (from http://www.javassist.org/)
@@ -171,7 +176,6 @@ The following software have components provided under the terms of this license:
 - Mockito (from http://mockito.org)
 - Netty Reactive Streams HTTP support (from )
 - Netty Reactive Streams Implementation (from )
-- Netty Reactive Streams Implementation (from )
 - Netty/Buffer (from http://netty.io/)
 - Netty/Buffer (from http://netty.io/)
 - Netty/Codec (from )
@@ -363,8 +367,8 @@ BSD-2-Clause
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Hamcrest Core (from http://hamcrest.org/)
 - Lucene Common Analyzers (from )
+- Reflections (from http://github.com/ronmamo/reflections)
 - Stax2 API (from http://github.com/FasterXML/stax2-api)
 
 ========================================================================
@@ -373,9 +377,8 @@ BSD-3-Clause
 The following software have components provided under the terms of this license:
 
 - ASM Core (from )
-- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
+- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - Google APIs Client Library for Java (from )
-- Hamcrest library (from )
 - Lucene Common Analyzers (from )
 - Lucene Core (from )
 - Lucene Suggest (from )
@@ -386,11 +389,8 @@ The following software have components provided under the terms of this license:
 - Netty/Codec/HTTP (from )
 - Netty/Codec/HTTP (from )
 - Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
-- Reflections (from http://github.com/ronmamo/reflections)
-- SnakeYAML (from http://www.snakeyaml.org)
 - Spring Core (from https://github.com/spring-projects/spring-framework)
 - Spring Core (from https://github.com/spring-projects/spring-framework)
-- Stax2 API (from http://github.com/FasterXML/stax2-api)
 
 ========================================================================
 CC-BY-2.5
@@ -414,8 +414,9 @@ CC0-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- XNIO API (from http://www.jboss.org/xnio)
-- XNIO NIO Implementation (from )
+- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
+- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
+- Netty/Common (from )
 - reactive-streams (from http://www.reactive-streams.org/)
 - reactive-streams (from http://www.reactive-streams.org/)
 
@@ -424,25 +425,22 @@ CDDL-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Apache Log4j Core (from )
 - Common Annotations 1.2 API (from )
-- JavaBeans Activation Framework API jar (from )
+- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
 - Old JAXB Core (from )
 - Old JAXB Runtime (from )
-- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
 ========================================================================
 CDDL-1.1
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Expression Language 3.0 (from http://uel.java.net)
+- Common Annotations 1.2 API (from )
 - Java Architecture For XML Binding (from )
 - Java Architecture For XML Binding (from )
-- Java Servlet API (from http://servlet-spec.java.net)
 - Java(TM) API for WebSocket (from )
-- JavaBeans Activation Framework (from )
 - JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
-- JavaMail API (from )
 
 ========================================================================
 CPL-1.0
@@ -451,6 +449,14 @@ The following software have components provided under the terms of this license:
 
 - JUnit (from http://junit.org)
 
+========================================================================
+DOC
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Woodstox (from https://github.com/FasterXML/woodstox)
+- aalto-xml (from )
+
 ========================================================================
 EPL-1.0
 ========================================================================
@@ -459,13 +465,10 @@ The following software have components provided under the terms of this license:
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Logback Classic Module (from )
 - Logback Contrib :: JSON :: Classic (from )
-- Logback Core Module (from )
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
-- SnakeYAML (from http://www.snakeyaml.org)
 - org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
 - org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/)
 - org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
@@ -479,7 +482,6 @@ The following software have components provided under the terms of this license:
 
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
 - org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
 - org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/)
 - org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
@@ -492,44 +494,25 @@ GPL-2.0-only
 The following software have components provided under the terms of this license:
 
 - Common Annotations 1.2 API (from )
+- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - Expression Language 3.0 (from http://uel.java.net)
-- Java Architecture For XML Binding (from )
-- Java Architecture For XML Binding (from )
 - Java Servlet API (from http://servlet-spec.java.net)
 - Java(TM) API for WebSocket (from )
-- JavaBeans Activation Framework (from )
-- JavaBeans Activation Framework API jar (from )
-- JavaMail API (from )
 - Old JAXB Core (from )
 - Old JAXB Runtime (from )
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
-========================================================================
-GPL-2.0-or-later
-========================================================================
-The following software have components provided under the terms of this license:
-
-- SnakeYAML (from http://www.snakeyaml.org)
-
 ========================================================================
 GPL-2.0-with-classpath-exception
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Checker Qual (from https://checkerframework.org)
-- Expression Language 3.0 (from http://uel.java.net)
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - Java Architecture For XML Binding (from )
 - Java Architecture For XML Binding (from )
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Java Servlet API (from http://servlet-spec.java.net)
 - Java(TM) API for WebSocket (from )
-- JavaBeans Activation Framework (from )
-- JavaBeans Activation Framework API jar (from )
-- JavaMail API (from )
 - Old JAXB Core (from )
 - Old JAXB Runtime (from )
-- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
 ========================================================================
 GPL-3.0-only
@@ -543,6 +526,22 @@ The following software have components provided under the terms of this license:
 - Old JAXB Runtime (from )
 - Project Lombok (from https://projectlombok.org)
 
+========================================================================
+ISC
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Java Native Access Platform (from https://github.com/java-native-access/jna)
+
+========================================================================
+ImageMagick
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Stax2 API (from http://github.com/FasterXML/stax2-api)
+- Woodstox (from https://github.com/FasterXML/woodstox)
+- aalto-xml (from )
+
 ========================================================================
 JSON
 ========================================================================
@@ -560,30 +559,10 @@ The following software have components provided under the terms of this license:
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Javassist (from http://www.javassist.org/)
 - Javassist (from http://www.javassist.org/)
-- Logback Classic Module (from )
 - Logback Contrib :: JSON :: Classic (from )
-- Logback Core Module (from )
 - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
-- XNIO API (from http://www.jboss.org/xnio)
-
-========================================================================
-LGPL-2.1-or-later
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Javassist (from http://www.javassist.org/)
-- SnakeYAML (from http://www.snakeyaml.org)
-
-========================================================================
-LGPL-3.0-only
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Apache Log4j API (from )
-- Apache Log4j Core (from )
 
 ========================================================================
 MIT
@@ -592,6 +571,7 @@ The following software have components provided under the terms of this license:
 
 - AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava)
 - Animal Sniffer Annotations (from )
+- Apache Log4j SLF4J Binding (from )
 - Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
@@ -642,14 +622,6 @@ The following software have components provided under the terms of this license:
 - spring-security-core (from http://spring.io/spring-security)
 - spring-security-core (from http://spring.io/spring-security)
 
-========================================================================
-MPL-1.1
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Javassist (from http://www.javassist.org/)
-- Javassist (from http://www.javassist.org/)
-
 ========================================================================
 MPL-2.0
 ========================================================================
@@ -657,7 +629,6 @@ The following software have components provided under the terms of this license:
 
 - Javassist (from http://www.javassist.org/)
 - Javassist (from http://www.javassist.org/)
-- OkHttp (from )
 
 ========================================================================
 MS-RL
@@ -671,21 +642,9 @@ Public-Domain
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - Old JAXB Core (from )
 - Old JAXB Runtime (from )
 - Spongy Castle (from http://rtyley.github.io/spongycastle/)
-- XNIO API (from http://www.jboss.org/xnio)
-- XNIO NIO Implementation (from )
-- reactive-streams (from http://www.reactive-streams.org/)
-
-========================================================================
-SPL-1.0
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Checker Qual (from https://checkerframework.org)
 
 ========================================================================
 WTFPL
@@ -715,7 +674,6 @@ The following software have components provided under the terms of this license:
 - Spring Web (from https://github.com/spring-projects/spring-framework)
 - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
 - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
-- reactive-streams (from http://www.reactive-streams.org/)
 
 ========================================================================
 unknown
@@ -723,14 +681,8 @@ unknown
 The following software have components provided under the terms of this license:
 
 - Byte Buddy (without dependencies) (from )
-- Common Annotations 1.2 API (from )
+- JSON in Java (from https://github.com/douglascrockford/JSON-java)
 - JUnit (from http://junit.org)
-- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - Spongy Castle (from http://rtyley.github.io/spongycastle/)
-- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
-- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/)
-- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
-- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
-- org.junit.platform:junit-platform-engine (from http://junit.org/junit5/)