diff --git a/NOTICE b/NOTICE
index cc594eba7982f040c93f83bfa2b4964d5545e24a..9524bfe5ee7b9fac42fa4b27aaf7407c6d5877e4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -411,7 +411,6 @@ The following software have components provided under the terms of this license:
 - 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)
-- MapStruct Core (from http://mapstruct.org/mapstruct/, https://repo1.maven.org/maven2/org/mapstruct/mapstruct)
 - Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact)
 - Maven Artifact Manager (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager)
 - Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core)
@@ -448,6 +447,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/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)
@@ -515,8 +515,6 @@ The following software have components provided under the terms of this license:
 - Spring JDBC (from https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-jdbc)
 - Spring JMS (from http://www.springframework.org, https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-jms)
 - Spring Messaging (from https://github.com/spring-projects/spring-framework)
-- Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata)
-- Spring Plugin Core (from https://github.com/spring-projects/spring-plugin/spring-plugin-core, https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core)
 - 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)
 - Spring Security - Namespace Configuration Module (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-config, https://spring.io/projects/spring-security, https://spring.io/spring-security)
 - Spring Security - Web Application Security Module (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-web, https://spring.io/projects/spring-security, https://spring.io/spring-security)
@@ -524,6 +522,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)
 - Vavr (from http://vavr.io, https://www.vavr.io)
 - Vavr Match (from http://vavr.io)
 - Woodstox (from https://github.com/FasterXML/woodstox)
@@ -566,26 +565,18 @@ The following software have components provided under the terms of this license:
 - proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1, https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-iamcredentials-v1)
 - proto-google-cloud-logging-v2 (from https://github.com/googleapis/java-logging/proto-google-cloud-logging-v2, https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-logging-v2)
 - proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis, https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
-- proto-google-common-protos (from https://github.com/googleapis/api-client-staging, https://github.com/googleapis/googleapis, https://github.com/googleapis/java-iam/proto-google-common-protos)
-- proto-google-iam-v1 (from https://github.com/googleapis/googleapis, https://github.com/googleapis/java-iam/proto-google-iam-v1)
+- proto-google-common-protos (from https://github.com/googleapis/api-client-staging, https://github.com/googleapis/gapic-generator-java, https://github.com/googleapis/googleapis, https://github.com/googleapis/java-iam/proto-google-common-protos)
+- proto-google-iam-v1 (from https://github.com/googleapis/gapic-generator-java, https://github.com/googleapis/googleapis, https://github.com/googleapis/java-iam/proto-google-iam-v1)
 - resilience4j (from https://github.com/resilience4j/resilience4j, https://resilience4j.readme.io, ttps://resilience4j.readme.io)
-- springfox-bean-validators (from https://github.com/springfox/springfox)
-- springfox-boot-starter (from https://github.com/springfox/springfox)
-- springfox-core (from https://github.com/springfox/springfox)
-- springfox-data-rest (from https://github.com/springfox/springfox)
-- springfox-oas (from https://github.com/springfox/springfox)
-- springfox-schema (from https://github.com/springfox/springfox)
-- springfox-spi (from https://github.com/springfox/springfox)
-- springfox-spring-web (from https://github.com/springfox/springfox)
-- springfox-spring-webflux (from https://github.com/springfox/springfox)
-- springfox-spring-webmvc (from https://github.com/springfox/springfox)
-- springfox-swagger-common (from https://github.com/springfox/springfox)
-- springfox-swagger-ui (from https://github.com/springfox/springfox)
-- springfox-swagger2 (from https://github.com/springfox/springfox)
+- 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)
 - 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)
 - swagger-models (from https://repo1.maven.org/maven2/io/swagger/core/v3/swagger-models, https://repo1.maven.org/maven2/io/swagger/swagger-models)
+- tomcat-embed-el (from http://tomcat.apache.org/, https://tomcat.apache.org/)
 - xml-apis (from https://repo1.maven.org/maven2/xml-apis/xml-apis)
 
 ========================================================================
@@ -637,7 +628,7 @@ The following software have components provided under the terms of this license:
 - Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
 - JSch (from http://www.jcraft.com/jsch/)
 - Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- 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)
 - 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)
@@ -703,6 +694,7 @@ The following software have components provided under the terms of this license:
 
 - Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava)
 - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
+- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
 - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
@@ -715,13 +707,30 @@ CDDL-1.0
 The following software have components provided under the terms of this license:
 
 - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- 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)
+- Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- 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 :: 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)
 - 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)
 
@@ -748,7 +757,7 @@ The following software have components provided under the terms of this license:
 
 - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
 - Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- 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)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
@@ -779,6 +788,7 @@ The following software have components provided under the terms of this license:
 - 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)
 - Logback Core Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
+- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
 - 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)
@@ -796,15 +806,32 @@ The following software have components provided under the terms of this license:
 - JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- 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)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - 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 :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- 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 :: 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)
 
 ========================================================================
 GPL-1.0-or-later
@@ -841,7 +868,7 @@ The following software have components provided under the terms of this license:
 
 - Checker Qual (from https://checkerframework.org)
 - Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- 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)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
@@ -849,9 +876,26 @@ 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 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)
+- Jetty :: Continuation (from http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation)
+- 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 :: 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)
 - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 
 ========================================================================
@@ -887,6 +931,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 - 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)
+- spring-security-crypto (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security)
 
 ========================================================================
 ImageMagick
@@ -921,6 +966,7 @@ The following software have components provided under the terms of this license:
 - 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)
 - Logback Core Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
+- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
 - 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)
@@ -1004,6 +1050,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)
 
 ========================================================================
 MPL-1.1
@@ -1105,6 +1152,7 @@ public-domain
 The following software have components provided under the terms of this license:
 
 - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
+- JBoss Logging 3 (from http://www.jboss.org)
 - JSON in Java (from https://github.com/douglascrockford/JSON-java)
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - PostgreSQL JDBC Driver
@@ -1115,7 +1163,7 @@ unknown
 The following software have components provided under the terms of this license:
 
 - AppEngine :: appengine-api-1.0-sdk (from https://repo1.maven.org/maven2/com/google/appengine/appengine-api-1.0-sdk)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- 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)
 - xml-apis (from https://repo1.maven.org/maven2/xml-apis/xml-apis)
 
 ========================================================================
diff --git a/provider/unit-azure/unit-aks/pom.xml b/provider/unit-azure/unit-aks/pom.xml
index f7a9cd6f7e7c54b0ecb1cac302c5c8ccf0a4c5ad..aa8a53e2d37dc3035b23f95503031483ee0fc0cc 100644
--- a/provider/unit-azure/unit-aks/pom.xml
+++ b/provider/unit-azure/unit-aks/pom.xml
@@ -25,7 +25,7 @@
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>	    
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <osdu.corelibazure.version>0.16.0</osdu.corelibazure.version>
+        <osdu.corelibazure.version>0.18.0-rc3</osdu.corelibazure.version>
         <jackson-databind.version>2.14.0</jackson-databind.version>
         <jackson.version>2.13.2</jackson.version>
         <spring-webmvc.version>5.3.22</spring-webmvc.version>
@@ -170,7 +170,7 @@
           </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
-                <version>3.7.0</version>
+                <version>3.8.1</version>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.8</source>
@@ -179,7 +179,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
diff --git a/unit-core/pom.xml b/unit-core/pom.xml
index 11b5349e6f1e2469c3a645341860305519d66c1f..82fbd2c281efb4440cded3fb3e90a987fd507244 100644
--- a/unit-core/pom.xml
+++ b/unit-core/pom.xml
@@ -21,7 +21,7 @@
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <springfox.version>3.0.0</springfox.version>
+        <openapi.version>1.6.9</openapi.version>
         <jackson-databind.version>2.14.0</jackson-databind.version>
         <jackson.version>2.13.2</jackson.version>
         <spring-webmvc.version>5.3.22</spring-webmvc.version>
@@ -36,6 +36,17 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>5.3.23</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -78,9 +89,9 @@
             <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>${springfox.version}</version>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>${openapi.version}</version>
         </dependency>
 
         <dependency>
@@ -199,7 +210,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <version>3.7.0</version>
+                <version>3.8.1</version>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.8</source>
@@ -209,7 +220,7 @@
 
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
diff --git a/unit-core/src/main/java/org/opengroup/osdu/unitservice/configuration/SwaggerConfiguration.java b/unit-core/src/main/java/org/opengroup/osdu/unitservice/configuration/SwaggerConfiguration.java
index bd0a630b04abf0683424c07201882bb54e1ccf1f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/unit-core/src/main/java/org/opengroup/osdu/unitservice/configuration/SwaggerConfiguration.java
+++ b/unit-core/src/main/java/org/opengroup/osdu/unitservice/configuration/SwaggerConfiguration.java
@@ -1,90 +0,0 @@
-package org.opengroup.osdu.unitservice.configuration;
-
-import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import springfox.documentation.builders.*;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import static org.apache.commons.lang3.StringUtils.startsWithIgnoreCase;
-
-@Configuration
-@EnableOpenApi
-public class SwaggerConfiguration {
-
-    private static final String AUTHORIZATION_HEADER = "Authorization";
-    private static final String DEFAULT_INCLUDE_PATTERN = "/.*";
-
-    @Bean
-    public Docket apiV2() {
-        RequestParameterBuilder builder = new RequestParameterBuilder();
-        List<RequestParameter> parameters = new ArrayList<>();
-        builder.name(DpsHeaders.DATA_PARTITION_ID)
-                .description("tenant")
-                .in(ParameterType.HEADER)
-                .required(true)
-                .build();
-        parameters.add(builder.build());
-        return new Docket(DocumentationType.OAS_30)
-                .apiInfo(new ApiInfoBuilder().version("2.0").title("Unit API V2 - DEPRECATED").build())
-                .groupName("~v2")
-                .globalRequestParameters(parameters)
-                .select()                
-                .apis(RequestHandlerSelectors.basePackage("org.opengroup.osdu.unitservice.api"))
-                .paths(s -> (startsWithIgnoreCase(s, "/api/unit/v2")|| startsWithIgnoreCase(s, "/api/unit/_ah")) && !startsWithIgnoreCase(s, "/api/unit/error"))
-                .build()
-                .securityContexts(Collections.singletonList(securityContext()))
-                .securitySchemes(Collections.singletonList(apiKey()));
-    }
-
-    @Bean
-    public Docket apiV3() {
-        RequestParameterBuilder builder = new RequestParameterBuilder();
-        List<RequestParameter> parameters = new ArrayList<>();
-        builder.name(DpsHeaders.DATA_PARTITION_ID)
-                .description("tenant")
-                .in(ParameterType.HEADER)
-                .required(true)
-                .build();
-        parameters.add(builder.build());
-        return new Docket(DocumentationType.OAS_30)
-                .apiInfo(new ApiInfoBuilder().version("3.0").title("Unit API V3").build())
-                .groupName("v3")
-                .globalRequestParameters(parameters)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("org.opengroup.osdu.unitservice.api"))
-                .paths(s -> (startsWithIgnoreCase(s, "/api/unit/v3") || startsWithIgnoreCase(s, "/api/unit/_ah") || startsWithIgnoreCase(s, "/api/unit/v3/info")) && !startsWithIgnoreCase(s, "/api/unit/error"))
-                .build()
-                .securityContexts(Collections.singletonList(securityContext()))
-                .securitySchemes(Collections.singletonList(apiKey()));
-    }
-
-    private ApiKey apiKey() {
-        return new ApiKey(AUTHORIZATION_HEADER, AUTHORIZATION_HEADER, "header");
-    }
-
-    private SecurityContext securityContext() {
-        return SecurityContext.builder()
-                .securityReferences(defaultAuth())
-                .operationSelector(o -> PathSelectors.regex(DEFAULT_INCLUDE_PATTERN).test(o.requestMappingPattern()))
-                .build();
-    }
-
-    private List<SecurityReference> defaultAuth() {
-        AuthorizationScope authorizationScope
-                = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes =
-                new AuthorizationScope[]{authorizationScope};
-        return Collections.singletonList(
-                new SecurityReference(AUTHORIZATION_HEADER, authorizationScopes));
-    }
-}
diff --git a/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/HomeController.java b/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/HomeController.java
index ab3506bff65dc07f9e15a10f8c9283c617609d33..815be35958d7a0c56548cccc6d3e79cb5e07ce80 100644
--- a/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/HomeController.java
+++ b/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/HomeController.java
@@ -1,12 +1,14 @@
 package org.opengroup.osdu.unitservice.swagger;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
+@Profile("!noswagger")
 public class HomeController {
-    @RequestMapping(value = {"/", "/swagger"})
+    @RequestMapping(value = { "/", "/swagger" })
     public String swagger() {
-        return "redirect:swagger-ui/index.html";
+        return "redirect:swagger-ui.html";
     }
-}
\ No newline at end of file
+}
diff --git a/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SpringfoxSwaggerHostResolver.java b/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SpringfoxSwaggerHostResolver.java
index c94d9bee73c5cd78836adc880192325f61f80af2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SpringfoxSwaggerHostResolver.java
+++ b/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SpringfoxSwaggerHostResolver.java
@@ -1,36 +0,0 @@
-package org.opengroup.osdu.unitservice.swagger;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.servers.Server;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import springfox.documentation.oas.web.OpenApiTransformationContext;
-import springfox.documentation.oas.web.WebMvcOpenApiTransformationFilter;
-import springfox.documentation.spi.DocumentationType;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Component
-@Order(Ordered.LOWEST_PRECEDENCE)
-public class SpringfoxSwaggerHostResolver implements WebMvcOpenApiTransformationFilter {
-
-    @Override
-    public boolean supports(DocumentationType delimiter) {
-        return delimiter == DocumentationType.OAS_30;
-    }
-
-    @Override
-    public OpenAPI transform(OpenApiTransformationContext<HttpServletRequest> context) {
-        OpenAPI swagger = context.getSpecification();
-
-        Server server = swagger.getServers().get(0);
-        if (server.getUrl().contains(":443")) {
-            // via the gateway
-            server.setUrl(server.getUrl().replace(":443",""));
-        }
-
-        return swagger;
-    }
-}
-
diff --git a/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SwaggerConfiguration.java b/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SwaggerConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..787c6a509e25094863df4ab55b5c5afed49b4522
--- /dev/null
+++ b/unit-core/src/main/java/org/opengroup/osdu/unitservice/swagger/SwaggerConfiguration.java
@@ -0,0 +1,79 @@
+package org.opengroup.osdu.unitservice.swagger;
+
+import io.swagger.v3.oas.models.servers.Server;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.context.annotation.Configuration;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.opengroup.osdu.core.common.model.http.DpsHeaders;
+import org.springdoc.core.customizers.OperationCustomizer;
+import org.springframework.context.annotation.Bean;
+import javax.servlet.ServletContext;
+import java.util.Collections;
+import org.springframework.context.annotation.Profile;
+
+
+
+@Configuration
+@Profile("!noswagger")
+public class SwaggerConfiguration {
+
+    @Bean
+    public GroupedOpenApi apiV2() {
+        return GroupedOpenApi.builder()
+                .group("~v2")
+                .pathsToExclude("/api/unit/error")
+                .pathsToMatch("/api/unit/v2", "/api/unit/_ah")
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi apiV3() {
+        return GroupedOpenApi.builder()
+                .group("v3")
+                .pathsToExclude("/api/unit/error")
+                .pathsToMatch("/api/unit/v3", "/api/unit/_ah", "/api/unit/v3/info")
+                .packagesToScan("src/main/java/org/opengroup/osdu/unitservice")
+                .build();
+    }
+
+    @Bean
+    public OpenAPI openApi(ServletContext servletContext) {
+        Server server = new Server().url(servletContext.getContextPath());
+        return new OpenAPI()
+                .servers(Collections.singletonList(server))
+                .info(new Info()
+                        .description("Unit Service that provides a set of APIs ")
+                        .title("Unit API V3 ")
+                        .version("2.0"))
+                .components(new Components()
+                        .addSecuritySchemes("Authorization",
+                                new SecurityScheme()
+                                        .type(SecurityScheme.Type.HTTP)
+                                        .scheme("bearer")
+                                        .bearerFormat("Authorization")
+                                        .in(SecurityScheme.In.HEADER)
+                                        .name("Authorization")))
+                .addSecurityItem(
+                        new SecurityRequirement()
+                                .addList("Authorization"));
+
+    }
+
+    @Bean
+    public OperationCustomizer customize() {
+        return (operation, handlerMethod) -> {
+            operation.addParametersItem(
+                    new Parameter()
+                            .in("header")
+                            .required(true)
+                            .description("Tenant Id")
+                            .name(DpsHeaders.DATA_PARTITION_ID));
+            return operation;
+        };
+    }
+}