diff --git a/NOTICE b/NOTICE
index 8929657bf05f72a9cd3385ce6eeb4720a3e63600..c969603f06e3b6fe44488dd51edd357d70e203c3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -44,7 +44,6 @@ Apache-2.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- AHC/Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
 - AMQP 1.0 JMS Spring Boot AutoConfiguration (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-autoconfigure)
 - AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter)
 - ASM Commons (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-commons)
@@ -267,9 +266,10 @@ The following software have components provided under the terms of this license:
 - Apache Maven Wagon :: Providers :: SSH Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh)
 - Apache Velocity (from http://velocity.apache.org/engine/devel/, http://velocity.apache.org/engine/releases/velocity-1.6.1/, http://velocity.apache.org/engine/releases/velocity-1.6.2/)
 - AssertJ Core (from ${project.organization.url}#${project.artifactId})
+- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
 - Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)
 - BSON (from http://bsonspec.org, https://bsonspec.org)
-- BSON Record Codec (from https://www.mongodb.com/)
+- BSON Record Codec (from <https://www.mongodb.com/>, https://www.mongodb.com/)
 - Bean Validation API (from http://beanvalidation.org)
 - Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave)
 - Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http)
@@ -337,31 +337,30 @@ The following software have components provided under the terms of this license:
 - Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
-- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
 - Javassist (from http://www.javassist.org/)
 - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
+- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
 - Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- Jetty :: Http Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
+- Jetty :: IO Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
 - Jetty :: Plus (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus)
 - Jetty :: Security (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security)
 - Jetty :: Server Core (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server)
 - Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations)
 - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet)
 - Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
 - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets)
 - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp)
-- Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
-- Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
-- Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
-- Jetty :: Websocket :: Server (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
-- Jetty :: Websocket :: Servlet (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
-- Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
-- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
-- Jetty Core :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
-- Jetty Core :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
-- Jetty Core :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
-- Jetty Core :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util)
-- Jetty Core :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
-- Jetty Core :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
+- Jetty :: Websocket :: API (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
+- Jetty :: Websocket :: Client (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
+- Jetty :: Websocket :: Common (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
+- Jetty :: Websocket :: Server (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
+- Jetty :: Websocket :: Servlet (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
+- Jetty :: Websocket :: javax.websocket :: Client Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
+- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
+- Jetty :: XML utilities (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
 - Jetty Server (from http://jetty.mortbay.org, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty)
 - Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/)
 - KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
@@ -372,10 +371,10 @@ The following software have components provided under the terms of this license:
 - KeePassJava2 :: Simple (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-simple)
 - Kotlin Stdlib (from https://kotlinlang.org/, https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib)
 - Kotlin Stdlib Common (from https://kotlinlang.org/)
-- Kotlin Stdlib Jdk7 (from https://kotlinlang.org/)
-- Kotlin Stdlib Jdk8 (from https://kotlinlang.org/)
+- Kotlin Stdlib Jdk7 (from <https://kotlinlang.org/>, https://kotlinlang.org/)
+- Kotlin Stdlib Jdk8 (from <https://kotlinlang.org/>, https://kotlinlang.org/)
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
+- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
 - Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
 - Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
@@ -416,7 +415,7 @@ The following software have components provided under the terms of this license:
 - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
 - Netty/Handler (from https://repo1.maven.org/maven2/io/netty/netty-handler)
 - Netty/Handler/Proxy (from https://repo1.maven.org/maven2/io/netty/netty-handler-proxy)
-- Netty/Incubator/Codec/Classes/Quic (from https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic)
+- Netty/Incubator/Codec/Classes/Quic (from <https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic>, https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic)
 - Netty/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver)
 - Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns)
 - Netty/Resolver/DNS/Classes/MacOS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns-classes-macos)
@@ -484,7 +483,7 @@ The following software have components provided under the terms of this license:
 - Spring Transaction (from https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework)
 - Spring Web (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-web)
 - Spring Web MVC (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-webmvc)
-- Swagger UI (from http://webjars.org)
+- Swagger UI (from <http://webjars.org>, http://webjars.org)
 - Vavr (from http://vavr.io, https://www.vavr.io)
 - Vavr Match (from http://vavr.io)
 - Woodstox (from https://github.com/FasterXML/woodstox)
@@ -511,10 +510,9 @@ The following software have components provided under the terms of this license:
 - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
 - org.xmlunit:xmlunit-core (from http://www.xmlunit.org/, https://www.xmlunit.org/)
 - resilience4j (from https://github.com/resilience4j/resilience4j, https://resilience4j.readme.io, ttps://resilience4j.readme.io)
-- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)
-- springdoc-openapi-common (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common)
-- springdoc-openapi-ui (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-ui)
-- springdoc-openapi-webmvc-core (from https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core)
+- springdoc-openapi-common (from <https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common>, https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-common)
+- springdoc-openapi-ui (from https://github.com/springdoc/springdoc-openapi, https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-ui)
+- springdoc-openapi-webmvc-core (from <https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core>, https://repo1.maven.org/maven2/org/springdoc/springdoc-openapi-webmvc-core)
 - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-annotations, https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
 - swagger-core (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-core, https://repo1.maven.org/maven2/io/swagger/swagger-core)
 - swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
@@ -535,7 +533,7 @@ The following software have components provided under the terms of this license:
 - JSch (from http://www.jcraft.com/jsch/)
 - Jodd BeanUtil (from http://jodd.org)
 - Jodd Core (from http://jodd.org)
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
+- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
 - Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
 - Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
@@ -561,7 +559,7 @@ The following software have components provided under the terms of this license:
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
+- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
 - Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
 - Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
@@ -633,27 +631,27 @@ The following software have components provided under the terms of this license:
 - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - Java EE Transaction API (from http://jcp.org/en/jsr/detail?id=907)
-- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
 - Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- Jetty :: Http Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
+- Jetty :: IO Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
 - Jetty :: Plus (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus)
 - Jetty :: Security (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security)
 - Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations)
 - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet)
+- Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
 - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets)
 - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp)
-- Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
-- Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
-- Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
-- Jetty :: Websocket :: Server (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
-- Jetty :: Websocket :: Servlet (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
-- Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
-- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
-- Jetty Core :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
-- Jetty Core :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
-- Jetty Core :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
-- Jetty Core :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util)
-- Jetty Core :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
-- Jetty Core :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
+- Jetty :: Websocket :: API (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
+- Jetty :: Websocket :: Client (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
+- Jetty :: Websocket :: Common (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
+- Jetty :: Websocket :: Server (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
+- Jetty :: Websocket :: Servlet (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
+- Jetty :: Websocket :: javax.websocket :: Client Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
+- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
+- Jetty :: XML utilities (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
 - Servlet Specification 2.5 API (from http://jetty.mortbay.org, https://repo1.maven.org/maven2/org/mortbay/jetty/servlet-api-2.5)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
@@ -663,7 +661,7 @@ CDDL-1.1
 The following software have components provided under the terms of this license:
 
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
-- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
 ========================================================================
@@ -691,27 +689,27 @@ The following software have components provided under the terms of this license:
 - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
+- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
 - Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- Jetty :: Http Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
+- Jetty :: IO Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
 - Jetty :: Plus (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus)
 - Jetty :: Security (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security)
 - Jetty :: Server Core (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server)
 - Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations)
 - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet)
+- Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
 - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets)
 - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp)
-- Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
-- Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
-- Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
-- Jetty :: Websocket :: Server (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
-- Jetty :: Websocket :: Servlet (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
-- Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
-- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
-- Jetty Core :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
-- Jetty Core :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
-- Jetty Core :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
-- Jetty Core :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util)
-- Jetty Core :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
-- Jetty Core :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
+- Jetty :: Websocket :: API (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
+- Jetty :: Websocket :: Client (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
+- Jetty :: Websocket :: Common (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
+- Jetty :: Websocket :: Server (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
+- Jetty :: Websocket :: Servlet (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
+- Jetty :: Websocket :: javax.websocket :: Client Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
+- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
+- Jetty :: XML utilities (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
 - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic)
 - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core)
 - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson)
@@ -739,26 +737,26 @@ The following software have components provided under the terms of this license:
 - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
+- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
 - Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- Jetty :: Http Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
+- Jetty :: IO Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
 - Jetty :: Plus (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus)
 - Jetty :: Security (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security)
 - Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations)
 - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet)
+- Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
 - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets)
 - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp)
-- Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
-- Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
-- Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
-- Jetty :: Websocket :: Server (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
-- Jetty :: Websocket :: Servlet (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
-- Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
-- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
-- Jetty Core :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
-- Jetty Core :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
-- Jetty Core :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
-- Jetty Core :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util)
-- Jetty Core :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
-- Jetty Core :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
+- Jetty :: Websocket :: API (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
+- Jetty :: Websocket :: Client (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
+- Jetty :: Websocket :: Common (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
+- Jetty :: Websocket :: Server (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
+- Jetty :: Websocket :: Servlet (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
+- Jetty :: Websocket :: javax.websocket :: Client Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
+- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
+- Jetty :: XML utilities (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
 
 ========================================================================
 GPL-1.0-or-later
@@ -776,7 +774,7 @@ The following software have components provided under the terms of this license:
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
-- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
 
 ========================================================================
 GPL-2.0-or-later
@@ -797,27 +795,27 @@ The following software have components provided under the terms of this license:
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
-- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
+- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
 - Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- Jetty :: Http Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
+- Jetty :: IO Utility (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
 - Jetty :: Plus (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus)
 - Jetty :: Security (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security)
 - Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations)
 - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet)
+- Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
 - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets)
 - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp)
-- Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
-- Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
-- Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
-- Jetty :: Websocket :: Server (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
-- Jetty :: Websocket :: Servlet (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
-- Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
-- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
-- Jetty Core :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client)
-- Jetty Core :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http)
-- Jetty Core :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io)
-- Jetty Core :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util)
-- Jetty Core :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax)
-- Jetty Core :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
+- Jetty :: Websocket :: API (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api)
+- Jetty :: Websocket :: Client (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client)
+- Jetty :: Websocket :: Common (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common)
+- Jetty :: Websocket :: Server (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server)
+- Jetty :: Websocket :: Servlet (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet)
+- Jetty :: Websocket :: javax.websocket :: Client Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl)
+- Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from <https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl>, https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl)
+- Jetty :: XML utilities (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
 ========================================================================
@@ -841,7 +839,7 @@ IPA
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
+- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Xerces2-j (from https://repo1.maven.org/maven2/xerces/xercesImpl, https://xerces.apache.org/xerces2-j/)
 
 ========================================================================
@@ -851,7 +849,7 @@ The following software have components provided under the terms of this license:
 
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)
+- Spring Security - Core (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-core, https://spring.io/projects/spring-security, https://spring.io/spring-security)
 
 ========================================================================
 ImageMagick
@@ -925,8 +923,8 @@ The following software have components provided under the terms of this license:
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt)
-- Jetty Core :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util)
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
+- Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
 - Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
 - Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
@@ -968,7 +966,7 @@ The following software have components provided under the terms of this license:
 - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
 - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
 - qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)
-- webjars-locator-core (from http://webjars.org)
+- webjars-locator-core (from <http://webjars.org>, http://webjars.org)
 
 ========================================================================
 MPL-1.1
@@ -1036,7 +1034,7 @@ X11
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
+- Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
 - Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
 - Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
diff --git a/devops/aws/chart/Chart.yaml b/devops/aws/chart/Chart.yaml
index f9d15a5f8dad20c007db00a10d61c14e6345d775..6b1c249a1f5b860792bfad8912d60f129a435325 100644
--- a/devops/aws/chart/Chart.yaml
+++ b/devops/aws/chart/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 name: "os-unit"
 version: __CHART_VERSION__
-kubeVersion: "v1.21.x-x-x"
+kubeVersion: ">= 1.21.x-x-x < 1.24.x-x-x"
 description: Unit Helm Chart for Kubernetes
 type: application
 appVersion: __VERSION__
 dependencies:
   - name: osdu-aws-lib
-    version: 0.1.0
+    version: 0.2.0
     repository: __HELM_REPO__/osdu-aws-lib/
 deprecated: false
diff --git a/devops/aws/chart/templates/tests/test-connection.yaml b/devops/aws/chart/templates/tests/test-connection.yaml
deleted file mode 100644
index f341212ea253eced15fd153dd894287341d8db93..0000000000000000000000000000000000000000
--- a/devops/aws/chart/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "common.fullname" . }}-test-connection"
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
diff --git a/devops/aws/chart/values.schema.json b/devops/aws/chart/values.schema.json
index c3bc0eb63c7dbdc49322be085c6a65f1be4938b7..d01920940ba1ae3ac7b6078c7321bf8042d24eca 100644
--- a/devops/aws/chart/values.schema.json
+++ b/devops/aws/chart/values.schema.json
@@ -6,10 +6,8 @@
         "image",
         "imagePullPolicy",
         "service",
-        "podAnnotations",
         "replicaCount",
-        "serviceAccountRole",
-        "securityContext"
+        "serviceAccountRole"
     ],
     "properties": {
         "image": {
@@ -262,10 +260,10 @@
                 "type": "string",
                 "title": "Allowed principal",
                 "examples": [
-                    "cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account",
+                    "cluster.local/ns/istio-system/sa/istio-ingressgateway",
                     "cluster.local/ns/osdu-services/sa/compliance-queue"
                 ]
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml
index f1d8f6f4963bcc55275d4649c118685ca9ba9a44..e4857c9c4710c5d8a77481a2de23b75687593d85 100644
--- a/devops/aws/chart/values.yaml
+++ b/devops/aws/chart/values.yaml
@@ -31,8 +31,6 @@ environmentVariables:
     value: "{{ .Values.global.cacheClusterKey }}"
   - name: ENTITLEMENTS_BASE_URL
     value: "http://os-entitlements:8080"
-podAnnotations: 
-  seccomp.security.alpha.kubernetes.io/pod: "runtime/default"
 
 # Resource Config
 replicaCount: 1
@@ -70,9 +68,13 @@ securityContext:
   capabilities:
     drop:
     - ALL
+podSecurityContext: 
+  fsGroup: 1337
+  seccompProfile:
+    type: RuntimeDefault
 
 allowedPrincipals:
-  - cluster.local/ns/istio-system/sa/istio-ingressgateway-service-account
+  - cluster.local/ns/istio-system/sa/istio-ingressgateway
   - cluster.local/ns/aws-binary-dms/sa/binary-dms
   - cluster.local/ns/osdu-airflow/sa/airflow-dag-upload
   - cluster.local/ns/osdu-ingest/sa/os-data-workflow