diff --git a/NOTICE b/NOTICE
index 4550b9d844884e80d69c14c5b5c3f9c9c91b6a27..27fecebdc51df0ce9c094a95e362c230474322e6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,782 +2,390 @@
 Generated by fossa-cli (https://github.com/fossas/fossa-cli).
 This software includes the following software and licenses:
 
-========================================================================
-Android-Sdk
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Android SDK (from https://www.android.com/)
-
 ========================================================================
 Apache-2.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- 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 based accessors helper used by json-smart (from )
-- AWS Java SDK for AWS Elemental MediaLive (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS KMS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS STS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Secrets Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudWatch Logs (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Cognito Identity Provider Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon DynamoDB (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon S3 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SNS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SQS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for the AWS Simple Systems Management (SSM) Service (from https://aws.amazon.com/sdkforjava)
-- AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava)
-- Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava)
-- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
-- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
-- Apache Commons IO (from https://commons.apache.org/proper/commons-io/)
-- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
-- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
-- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
-- Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version})
-- Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
-- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
-- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
-- Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga)
-- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
-- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
-- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
-- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
-- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
-- AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core)
-- 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)
-- AutoValue Annotations (from https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations)
-- Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java)
-- 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)
-- Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty)
-- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
-- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
-- ClassMate (from http://github.com/cowtowncoder/java-classmate)
-- Cloud Key Management Service (KMS) API v1-rev20210820-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
-- Cloud Storage JSON API v1-rev20200814-1.30.10 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
-- Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
-- 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)
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- Expression Language 3.0 (from http://uel.java.net)
-- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
-- GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
-- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
-- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
-- Google Cloud Core (from https://github.com/googleapis/java-core)
-- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http)
-- Google Cloud Core gRPC (from https://github.com/googleapis/java-core)
-- Google Cloud Datastore (from https://github.com/googleapis/java-datastore)
-- Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials)
-- Google Cloud Logging (from https://github.com/googleapis/java-logging)
-- Google Cloud Pub/Sub (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub)
-- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage)
-- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
-- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
-- Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client)
-- Gson (from http://code.google.com/p/google-gson/)
-- Gson (from http://code.google.com/p/google-gson/)
-- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
-- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
-- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
-- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
-- HPPC Collections (from https://repo1.maven.org/maven2/com/carrotsearch/hppc)
-- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
-- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
-- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
-- HttpClient (from http://hc.apache.org/httpcomponents-client)
-- IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java)
-- IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java)
-- IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
-- IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java)
-- Identity and Access Management (IAM) API v1-rev20191010-1.30.3 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
-- Identity and Access Management (IAM) API v1-rev20191010-1.30.3 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
-- J2ObjC Annotations (from https://github.com/google/j2objc/)
-- JBoss Logging 3 (from http://www.jboss.org)
-- JBoss Threads (from https://repo1.maven.org/maven2/org/jboss/threads/jboss-threads)
-- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
-- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
-- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart)
-- JSON Web Token support for the JVM (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt)
-- JSON library from Android SDK (from http://developer.android.com/sdk)
-- JSONassert (from http://github.com/skyscreamer/yoga)
-- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec)
-- Jackson (from http://jackson.codehaus.org)
-- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2)
-- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
-- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
-- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
-- Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson)
-- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base)
-- Jackson-annotations (from http://github.com/FasterXML/jackson)
-- Jackson-core (from https://github.com/FasterXML/jackson)
-- Jackson-core (from https://github.com/FasterXML/jackson)
-- Jackson-dataformat-Smile (from http://wiki.fasterxml.com/JacksonForSmile)
-- Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml)
-- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
-- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda)
-- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
-- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
-- 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 4.0 API (from )
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Java Servlet API (from http://servlet-spec.java.net)
-- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
-- Javassist (from http://www.javassist.org/)
-- Javassist (from http://www.javassist.org/)
-- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
-- Joda-Time (from https://www.joda.org/joda-time/)
-- KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
-- KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom)
-- KeePassJava2 :: JAXB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-jaxb)
-- KeePassJava2 :: KDB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdb)
-- KeePassJava2 :: KDBX (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdbx)
-- KeePassJava2 :: Simple (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-simple)
-- 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)
-- Lucene Common Analyzers (from 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 Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
-- Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
-- Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
-- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
-- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
-- Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
-- Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
-- Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
-- Lucene Sandbox (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Lucene Spatial (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial)
-- Lucene Spatial 3D (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d)
-- Lucene Spatial Extras (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial-extras)
-- Lucene Suggest (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- MapStruct Core (from https://repo1.maven.org/maven2/org/mapstruct/mapstruct)
-- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
-- 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)
-- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://www.mockito.org)
-- Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer)
-- Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer)
-- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
-- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
-- Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns)
-- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Netty/Codec/HTTP2 (from https://repo1.maven.org/maven2/io/netty/netty-codec-http2)
-- Netty/Codec/HTTP2 (from https://repo1.maven.org/maven2/io/netty/netty-codec-http2)
-- Netty/Codec/Socks (from https://repo1.maven.org/maven2/io/netty/netty-codec-socks)
-- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
-- 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 (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/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver)
-- 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/TomcatNative [BoringSSL - Static] (from https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static)
-- Netty/Transport (from https://repo1.maven.org/maven2/io/netty/netty-transport)
-- Netty/Transport (from https://repo1.maven.org/maven2/io/netty/netty-transport)
-- Netty/Transport/Native/Unix/Common (from https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common)
-- Netty/Transport/Native/Unix/Common (from https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common)
-- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
-- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
-- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
-- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
-- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
-- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
-- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor)
-- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
-- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
-- Objenesis (from http://objenesis.org)
-- Okio (from https://repo1.maven.org/maven2/com/squareup/okio/okio)
-- Okio (from https://repo1.maven.org/maven2/com/squareup/okio/okio)
-- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
-- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
-- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
-- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
-- PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf)
-- QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client)
-- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
-- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
-- SnakeYAML (from http://www.snakeyaml.org)
-- Spring AOP (from https://github.com/spring-projects/spring-framework)
-- Spring Beans (from https://github.com/spring-projects/spring-framework)
-- Spring Boot AOP Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-aop)
-- Spring Boot Actuator (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator)
-- Spring Boot Logging Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-logging)
-- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty)
-- Spring Boot Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter)
-- Spring Boot Test (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-test)
-- Spring Boot Undertow Starter (from https://projects.spring.io/spring-boot/)
-- Spring Boot Undertow Starter (from https://projects.spring.io/spring-boot/)
-- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web)
-- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web)
-- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux)
-- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
-- Spring Context (from https://github.com/spring-projects/spring-framework)
-- Spring Core (from https://github.com/spring-projects/spring-framework)
-- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons)
-- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
-- Spring JMS (from https://github.com/spring-projects/spring-framework)
-- 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://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core)
-- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
-- Spring Transaction (from https://github.com/spring-projects/spring-framework)
-- Spring Web (from https://github.com/spring-projects/spring-framework)
-- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
-- Spring WebFlux (from https://github.com/spring-projects/spring-framework)
-- T-Digest (from https://github.com/tdunning/t-digest)
-- Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
-- Undertow Core (from https://repo1.maven.org/maven2/io/undertow/undertow-core)
-- Undertow Servlet (from https://repo1.maven.org/maven2/io/undertow/undertow-servlet)
-- Undertow Servlet (from https://repo1.maven.org/maven2/io/undertow/undertow-servlet)
-- Undertow WebSockets JSR356 implementations (from https://repo1.maven.org/maven2/io/undertow/undertow-websockets-jsr)
-- Undertow WebSockets JSR356 implementations (from https://repo1.maven.org/maven2/io/undertow/undertow-websockets-jsr)
-- Vavr (from http://vavr.io)
-- Vavr Match (from http://vavr.io)
-- WildFly Client Configuration (from )
-- Woodstox (from https://github.com/FasterXML/woodstox)
-- XNIO API (from http://www.jboss.org/xnio)
-- XNIO API (from http://www.jboss.org/xnio)
-- XNIO NIO Implementation (from https://repo1.maven.org/maven2/org/jboss/xnio/xnio-nio)
-- XNIO NIO Implementation (from https://repo1.maven.org/maven2/org/jboss/xnio/xnio-nio)
-- Zipkin Core Library (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin)
-- Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave)
-- Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter)
-- aalto-xml (from )
-- aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
-- cli (from https://github.com/elastic/elasticsearch)
-- compiler (from http://github.com/spullara/mustache.java)
-- core (from https://github.com/elastic/elasticsearch)
-- datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client)
-- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
-- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
-- grpc-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/grpc-google-cloud-pubsub-v1)
-- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-api (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-auth (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-context (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-context (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-core (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-core (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-grpclb (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-netty-shaded (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-netty-shaded (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-stub (from https://github.com/grpc/grpc-java)
-- io.grpc:grpc-stub (from https://github.com/grpc/grpc-java)
-- ion-java (from https://github.com/amznlabs/ion-java/)
-- ion-java (from https://github.com/amznlabs/ion-java/)
-- jackson-databind (from http://github.com/FasterXML/jackson)
-- jackson-databind (from http://github.com/FasterXML/jackson)
-- java-cloudant (from https://cloudant.com)
-- java-cloudant (from https://cloudant.com)
-- javatuples (from http://www.javatuples.org)
-- javax.inject (from http://code.google.com/p/atinject/)
-- jose4j (from https://bitbucket.org/b_c/jose4j/)
-- lang-mustache (from https://github.com/elastic/elasticsearch)
-- lettuce (from http://github.com/mp911de/lettuce/wiki)
-- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
-- micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer)
-- mockito-core (from https://github.com/mockito/mockito)
-- nio-multipart-parser (from )
-- nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage)
-- okhttp (from https://square.github.io/okhttp/)
-- okhttp (from https://square.github.io/okhttp/)
-- okhttp-logging-interceptor (from https://square.github.io/okhttp/)
-- okhttp-urlconnection (from https://square.github.io/okhttp/)
-- okhttp-urlconnection (from https://square.github.io/okhttp/)
-- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
-- org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/)
-- org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
-- org.xmlunit:xmlunit-core (from https://www.xmlunit.org/)
-- parent-join (from https://github.com/elastic/elasticsearch)
-- perfmark:perfmark-api (from https://github.com/perfmark/perfmark)
-- project ':json-path' (from https://github.com/jayway/JsonPath)
-- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
-- proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1)
-- proto-google-cloud-logging-v2 (from https://github.com/googleapis/java-logging/proto-google-cloud-logging-v2)
-- proto-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-pubsub-v1)
-- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
-- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
-- proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1)
-- proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
-- rank-eval (from https://github.com/elastic/elasticsearch)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- rest (from https://github.com/elastic/elasticsearch)
-- rest-high-level (from https://github.com/elastic/elasticsearch)
-- rxjava (from https://github.com/ReactiveX/RxJava)
-- secure-sm (from https://github.com/elastic/elasticsearch)
-- server (from https://github.com/elastic/elasticsearch)
-- spring-boot (from https://spring.io/projects/spring-boot)
-- spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot)
-- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot)
-- spring-boot-dependencies (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-actuator (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-json (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-security (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-test (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
-- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot)
-- spring-security-config (from https://spring.io/spring-security)
-- spring-security-config (from https://spring.io/spring-security)
-- spring-security-core (from https://spring.io/spring-security)
-- spring-security-oauth2-core (from https://spring.io/spring-security)
-- spring-security-oauth2-jose (from https://spring.io/spring-security)
-- spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security)
-- spring-security-web (from https://spring.io/spring-security)
-- spring-security-web (from https://spring.io/spring-security)
-- springfox-core (from https://github.com/springfox/springfox)
-- springfox-schema (from https://github.com/springfox/springfox)
-- springfox-spi (from https://github.com/springfox/springfox)
-- springfox-spring-web (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)
-- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
-- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
-- swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models)
-- tomcat-embed-core (from http://tomcat.apache.org/)
-- tomcat-embed-el (from http://tomcat.apache.org/)
-- tomcat-embed-websocket (from https://tomcat.apache.org/)
-- wildfly-common (from https://repo1.maven.org/maven2/org/wildfly/common/wildfly-common)
-- x-content (from https://github.com/elastic/elasticsearch)
+- aiobotocore (from https://github.com/aio-libs/aiobotocore)
+- aiohttp (from https://github.com/aio-libs/aiohttp/)
+- async-timeout (from https://github.com/aio-libs/async_timeout/)
+- boto3 (from https://github.com/boto/boto3)
+- botocore (from https://github.com/boto/botocore)
+- coverage (from https://github.com/nedbat/coveragepy)
+- cryptography (from https://github.com/pyca/cryptography)
+- google-api-core (from https://github.com/GoogleCloudPlatform/google-cloud-python)
+- google-auth (from https://github.com/googleapis/google-auth-library-python)
+- google-auth-oauthlib (from https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib)
+- google-cloud-core (from https://github.com/GoogleCloudPlatform/google-cloud-python)
+- google-cloud-monitoring (from https://github.com/GoogleCloudPlatform/google-cloud-python)
+- google-cloud-trace (from https://github.com/googleapis/googleapis)
+- googleapis-common-protos (from https://github.com/googleapis/googleapis)
+- grpcio (from https://grpc.io)
+- importlib-metadata (from http://importlib-metadata.readthedocs.io/)
+- jsonpath-ng (from https://github.com/h2non/jsonpath-ng)
+- msgpack (from http://msgpack.org/)
+- multidict (from https://github.com/aio-libs/multidict/)
+- numpy (from http://www.numpy.org)
+- openapi-spec-validator (from https://github.com/p1c2u/openapi-spec-validator)
+- opencensus (from https://github.com/census-instrumentation/opencensus-python)
+- opencensus-context (from https://github.com/census-instrumentation/opencensus-python/tree/master/context/opencensus-context)
+- opencensus-ext-azure (from https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure)
+- opencensus-ext-logging (from https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-logging)
+- opencensus-ext-ocagent (from https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-ocagent)
+- opencensus-ext-stackdriver (from https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-stackdriver)
+- opencensus-proto (from https://github.com/census-instrumentation/opencensus-proto/tree/master/gen-python)
+- packaging (from https://github.com/pypa/packaging)
+- pandas (from http://pandas.pydata.org)
+- pep517 (from https://github.com/takluyver/pep517)
+- pyarrow (from https://arrow.apache.org/)
+- pytest-asyncio (from https://github.com/pytest-dev/pytest-asyncio)
+- pytest-dependency (from https://github.com/RKrahl/pytest-dependency)
+- python-dateutil (from https://dateutil.readthedocs.org)
+- python-multipart (from http://github.com/andrew-d/python-multipart)
+- requests (from https://requests.readthedocs.io)
+- rfc3986 (from https://rfc3986.readthedocs.org)
+- rsa (from https://stuvel.eu/rsa)
+- s3transfer (from https://github.com/boto/s3transfer)
+- sniffio (from https://github.com/python-trio/sniffio)
+- sortedcontainers (from http://www.grantjenks.com/docs/sortedcontainers/)
+- structlog (from http://www.structlog.org/)
+- tblib (from https://github.com/ionelmc/python-tblib)
+- toposort (from https://bitbucket.org/ericvsmith/toposort)
+- tornado (from http://www.tornadoweb.org/)
+- yarl (from https://github.com/aio-libs/yarl/)
 
 ========================================================================
 BSD-2-Clause
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- API Common (from https://github.com/googleapis/api-common-java)
-- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
-- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
-- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
-- Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
-- Reflections (from http://github.com/ronmamo/reflections)
-- Stax2 API (from http://github.com/FasterXML/stax2-api)
-- ThreeTen backport (from https://www.threeten.org/threetenbp)
+- grpcio (from https://grpc.io)
+- locket (from http://github.com/mwilliamson/locket.py)
+- mock (from https://github.com/testing-cabal/mock)
+- numpy (from http://www.numpy.org)
+- packaging (from https://github.com/pypa/packaging)
+- ply (from http://www.dabeaz.com/ply/)
+- pyasn1 (from http://sourceforge.net/projects/pyasn1/)
+- pyasn1-modules (from http://sourceforge.net/projects/pyasn1/)
+- pycparser (from https://github.com/eliben/pycparser)
+- tblib (from https://github.com/ionelmc/python-tblib)
+- wrapt (from https://github.com/GrahamDumpleton/wrapt)
 
 ========================================================================
 BSD-3-Clause
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- API Common (from https://github.com/googleapis/api-common-java)
-- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
-- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
-- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
-- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
-- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
-- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials)
-- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http)
-- Lucene Common Analyzers (from 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 Suggest (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest)
-- 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)
-- Mockito (from http://www.mockito.org)
-- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
-- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
-- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
-- Reflections (from http://github.com/ronmamo/reflections)
-- SnakeYAML (from http://www.snakeyaml.org)
-- Spring Core (from https://github.com/spring-projects/spring-framework)
-- ThreeTen backport (from https://www.threeten.org/threetenbp)
-- asm (from http://asm.ow2.io/)
-
-========================================================================
-CC-BY-2.5
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Checker Qual (from https://checkerframework.org)
-- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
+- HeapDict (from http://stutzbachenterprises.com/)
+- adlfs (from https://github.com/hayesgb/adlfs/)
+- asgiref (from http://github.com/django/asgiref/)
+- click (from http://github.com/mitsuhiko/click)
+- cloudpickle (from https://github.com/cloudpipe/cloudpickle)
+- cryptography (from https://github.com/pyca/cryptography)
+- dask (from http://github.com/dask/dask/)
+- decorator (from https://github.com/micheles/decorator)
+- distributed (from https://distributed.readthedocs.io/en/latest/)
+- fsspec (from http://github.com/intake/filesystem_spec)
+- gcsfs (from https://github.com/dask/gcsfs)
+- grpcio (from https://grpc.io)
+- hiredis (from https://github.com/redis/hiredis-py)
+- httpcore (from https://github.com/encode/httpcore)
+- httpx (from https://github.com/encode/httpx)
+- idna (from https://github.com/kjd/idna)
+- isodate (from http://cheeseshop.python.org/pypi/isodate)
+- locket (from http://github.com/mwilliamson/locket.py)
+- mock (from https://github.com/testing-cabal/mock)
+- numpy (from http://www.numpy.org)
+- oauthlib (from https://github.com/idan/oauthlib)
+- openapi-schema-validator (from https://github.com/p1c2u/openapi-schema-validator)
+- packaging (from https://github.com/pypa/packaging)
+- pandas (from http://pandas.pydata.org)
+- partd (from http://github.com/dask/partd/)
+- pip-tools (from https://github.com/jazzband/pip-tools/)
+- ply (from http://www.dabeaz.com/ply/)
+- protobuf (from https://developers.google.com/protocol-buffers/)
+- psutil (from https://github.com/giampaolo/psutil)
+- pyarrow (from https://arrow.apache.org/)
+- pyasn1 (from http://sourceforge.net/projects/pyasn1/)
+- pyasn1-modules (from http://sourceforge.net/projects/pyasn1/)
+- pycparser (from https://github.com/eliben/pycparser)
+- pyrsistent (from http://github.com/tobgu/pyrsistent/)
+- python-dateutil (from https://dateutil.readthedocs.org)
+- python-rapidjson (from https://github.com/python-rapidjson/python-rapidjson)
+- requests-oauthlib (from https://github.com/requests/requests-oauthlib)
+- s3fs (from http://github.com/dask/s3fs/)
+- starlette (from https://github.com/encode/starlette)
+- tblib (from https://github.com/ionelmc/python-tblib)
+- toolz (from http://github.com/pytoolz/toolz/)
+- uvicorn (from https://github.com/tomchristie/uvicorn)
+- wrapt (from https://github.com/GrahamDumpleton/wrapt)
+- zict (from http://github.com/dask/zict/)
 
 ========================================================================
 CC-BY-4.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- 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)
+- adlfs (from https://github.com/hayesgb/adlfs/)
+- dask (from http://github.com/dask/dask/)
+- distributed (from https://distributed.readthedocs.io/en/latest/)
+- fsspec (from http://github.com/intake/filesystem_spec)
+- gcsfs (from https://github.com/dask/gcsfs)
+- numpy (from http://www.numpy.org)
+- pandas (from http://pandas.pydata.org)
+- partd (from http://github.com/dask/partd/)
+- s3fs (from http://github.com/dask/s3fs/)
+- toolz (from http://github.com/pytoolz/toolz/)
 
 ========================================================================
-CC0-1.0
+CC-BY-SA-3.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- reactive-streams (from http://www.reactive-streams.org/)
+- numpy (from http://www.numpy.org)
 
 ========================================================================
-CDDL-1.0
+GPL-2.0-only
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JAXB Reference Implementation (from http://jaxb.java.net/)
-- JavaBeans Activation Framework API jar (from )
-- Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
+- coverage (from https://github.com/nedbat/coveragepy)
+- grpcio (from https://grpc.io)
 
 ========================================================================
-CDDL-1.1
+GPL-2.0-or-later
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Common Annotations 1.2 API (from )
-- Expression Language 3.0 (from http://uel.java.net)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from http://servlet-spec.java.net)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- JavaBeans Activation Framework (from )
-- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
-- JavaMail API (from https://repo1.maven.org/maven2/com/sun/mail/javax.mail)
-- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
-- tomcat-embed-core (from http://tomcat.apache.org/)
+- grpcio (from https://grpc.io)
 
 ========================================================================
-CPL-1.0
+GPL-3.0-only
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JUnit (from http://junit.org)
+- coverage (from https://github.com/nedbat/coveragepy)
+- grpcio (from https://grpc.io)
+- pyparsing (from http://pyparsing.wikispaces.com/)
+- rfc3986 (from https://rfc3986.readthedocs.org)
+- strict-rfc3339 (from http://www.danielrichman.co.uk/libraries/strict-rfc3339.html)
 
 ========================================================================
-EPL-1.0
+GPL-3.0-or-later
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- AspectJ weaver (from http://www.aspectj.org)
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
-- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
-- JUnit Jupiter API (from https://junit.org/junit5/)
-- JUnit Jupiter Engine (from https://junit.org/junit5/)
-- JUnit Jupiter Params (from https://junit.org/junit5/)
-- JUnit Platform Commons (from https://junit.org/junit5/)
-- JUnit Platform Engine API (from https://junit.org/junit5/)
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- Logback Classic Module (from http://logback.qos.ch)
-- 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)
-- Logback Core Module (from http://logback.qos.ch)
-- 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)
-
-========================================================================
-EPL-2.0
+- strict-rfc3339 (from http://www.danielrichman.co.uk/libraries/strict-rfc3339.html)
+
+========================================================================
+ISC
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
-- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
-- JUnit Jupiter API (from https://junit.org/junit5/)
-- JUnit Jupiter Engine (from https://junit.org/junit5/)
-- JUnit Jupiter Params (from https://junit.org/junit5/)
-- JUnit Platform Commons (from https://junit.org/junit5/)
-- JUnit Platform Engine API (from https://junit.org/junit5/)
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
+- grpcio (from https://grpc.io)
+- requests-oauthlib (from https://github.com/requests/requests-oauthlib)
 
 ========================================================================
-GPL-2.0-only
+Info-ZIP
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Expression Language 3.0 (from http://uel.java.net)
-- JAXB Reference Implementation (from http://jaxb.java.net/)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from http://servlet-spec.java.net)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- JavaBeans Activation Framework (from )
-- Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
-- tomcat-embed-core (from http://tomcat.apache.org/)
+- grpcio (from https://grpc.io)
 
 ========================================================================
-GPL-2.0-or-later
+JSON
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- SnakeYAML (from http://www.snakeyaml.org)
+- python-rapidjson (from https://github.com/python-rapidjson/python-rapidjson)
 
 ========================================================================
-GPL-2.0-with-classpath-exception
+LGPL-2.1-only
 ========================================================================
 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)
-- JAXB Reference Implementation (from http://jaxb.java.net/)
-- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
-- Java Architecture for XML Binding (from http://jaxb.java.net/)
-- Java Servlet 4.0 API (from )
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from http://servlet-spec.java.net)
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- JavaBeans Activation Framework (from )
-- Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
-- tomcat-embed-core (from http://tomcat.apache.org/)
+- chardet (from https://github.com/chardet/chardet)
+- charset-normalizer (from https://github.com/ousret/charset_normalizer)
 
 ========================================================================
-GPL-3.0-only
+LGPL-2.1-or-later
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- JAXB Reference Implementation (from http://jaxb.java.net/)
-- JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
-- Java Servlet 4.0 API (from )
-- Java Servlet 4.0 API (from )
-- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
-- Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
-- Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Project Lombok (from http://projectlombok.org)
+- chardet (from https://github.com/chardet/chardet)
 
 ========================================================================
-JSON
+LGPL-3.0-only
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JSON in Java (from https://github.com/douglascrockford/JSON-java)
+- chardet (from https://github.com/chardet/chardet)
+- pycparser (from https://github.com/eliben/pycparser)
 
 ========================================================================
-LGPL-2.1-only
+MIT
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
-- Java Native Access (from https://github.com/java-native-access/jna)
-- 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 http://logback.qos.ch)
-- 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)
-- Logback Core Module (from http://logback.qos.ch)
-- 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)
+- PyJWT (from http://github.com/jpadilla/pyjwt)
+- PyYAML (from http://pyyaml.org/wiki/PyYAML)
+- adal (from https://github.com/AzureAD/azure-activedirectory-library-for-python)
+- aiohttp (from https://github.com/aio-libs/aiohttp/)
+- aioitertools (from https://github.com/jreese/aioitertools)
+- aioredis (from https://github.com/aio-libs/aioredis)
+- anyio (from https://pypi.org/project/anyio/3.3.4/)
+- asgiref (from http://github.com/django/asgiref/)
+- attrs (from https://attrs.readthedocs.io/)
+- azure-common (from https://github.com/Azure/azure-sdk-for-python)
+- azure-core (from https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core)
+- azure-datalake-store (from https://github.com/Azure/azure-data-lake-store-python)
+- azure-identity (from https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity)
+- azure-keyvault (from https://github.com/Azure/azure-sdk-for-python)
+- azure-keyvault-certificates (from https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-certificates)
+- azure-keyvault-keys (from https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-keys)
+- azure-keyvault-secrets (from https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-secrets)
+- azure-storage-blob (from https://github.com/Azure/azure-storage-python)
+- backoff (from https://github.com/litl/backoff)
+- botocore (from https://github.com/boto/botocore)
+- cachetools (from https://github.com/tkem/cachetools)
+- cffi (from http://cffi.readthedocs.org)
+- charset-normalizer (from https://github.com/ousret/charset_normalizer)
+- coverage (from https://github.com/nedbat/coveragepy)
+- fastapi (from https://github.com/tiangolo/fastapi)
+- grpcio (from https://grpc.io)
+- h11 (from https://github.com/python-hyper/h11)
+- iniconfig (from http://github.com/RonnyPfannschmidt/iniconfig)
+- jmespath (from https://github.com/jmespath/jmespath.py)
+- jsonschema (from http://github.com/Julian/jsonschema)
+- mockito (from https://github.com/kaste/mockito-python)
+- msal (from https://github.com/AzureAD/microsoft-authentication-library-for-python)
+- msal-extensions (from https://pypi.org/project/msal-extensions/0.1.3/)
+- msrest (from https://github.com/Azure/msrest-for-python)
+- munch (from http://github.com/Infinidat/munch)
+- natsort (from https://github.com/SethMMorton/natsort)
+- numpy (from http://www.numpy.org)
+- pandas (from http://pandas.pydata.org)
+- pep517 (from https://github.com/takluyver/pep517)
+- pluggy (from https://github.com/pytest-dev/pluggy)
+- py (from http://pylib.readthedocs.org/)
+- pyarrow (from https://arrow.apache.org/)
+- pydantic (from https://github.com/samuelcolvin/pydantic)
+- pyparsing (from http://pyparsing.wikispaces.com/)
+- pyrsistent (from http://github.com/tobgu/pyrsistent/)
+- pytest (from http://pytest.org)
+- pytest-cov (from https://github.com/pytest-dev/pytest-cov)
+- pytest-httpx (from https://colin-b.github.io/pytest_httpx/)
+- pytest-mock (from https://github.com/pytest-dev/pytest-mock/)
+- python-rapidjson (from https://github.com/python-rapidjson/python-rapidjson)
+- python-ulid (from https://github.com/mdomke/python-ulid)
+- pytz (from http://pythonhosted.org/pytz)
+- requests-oauthlib (from https://github.com/requests/requests-oauthlib)
+- six (from http://pypi.python.org/pypi/six/)
+- sniffio (from https://github.com/python-trio/sniffio)
+- structlog (from http://www.structlog.org/)
+- toml (from https://github.com/uiri/toml)
+- tomli (from https://pypi.org/project/tomli/1.2.1/)
+- urllib3 (from https://urllib3.readthedocs.io/)
+- xmltodict (from https://github.com/martinblech/xmltodict)
+- zipp (from https://github.com/jaraco/zipp)
 
 ========================================================================
-LGPL-2.1-or-later
+MPL-2.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JBoss Threads (from https://repo1.maven.org/maven2/org/jboss/threads/jboss-threads)
-- Javassist (from http://www.javassist.org/)
-- Javassist (from http://www.javassist.org/)
-- SnakeYAML (from http://www.snakeyaml.org)
+- certifi (from http://certifi.io/)
+- charset-normalizer (from https://github.com/ousret/charset_normalizer)
 
 ========================================================================
-LGPL-3.0-only
+NCSA
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
-- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
+- numpy (from http://www.numpy.org)
 
 ========================================================================
-MIT
+OPL-1.0
 ========================================================================
 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 https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
-- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
-- 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)
-- Azure Spring Boot AutoConfigure (from https://github.com/Azure/azure-sdk-for-java)
-- Checker Qual (from https://checkerframework.org)
-- Checker Qual (from https://checkerframework.org)
-- Checker Qual (from https://checkerframework.org)
-- JOpt Simple (from http://pholser.github.com/jopt-simple)
-- JUL to SLF4J bridge (from http://www.slf4j.org)
-- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
-- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- Microsoft Application Insights Java SDK Core (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)
-- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure SDK annotations (from https://github.com/Microsoft/java-api-annotations)
-- Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure SDK for Service Bus (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure SDK for eventgrid (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure client library for KeyVault Keys (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://www.mockito.org)
-- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
-- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
-- Project Lombok (from http://projectlombok.org)
-- SLF4J API Module (from http://www.slf4j.org)
-- Spongy Castle (from http://rtyley.github.io/spongycastle/)
-- Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos)
-- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
-- azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/)
-- azure-identity (from https://repo1.maven.org/maven2/com/azure/azure-identity)
-- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
-- java jwt (from https://github.com/auth0/java-jwt)
-- java jwt (from https://github.com/auth0/java-jwt)
-- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
-- mockito-core (from https://github.com/mockito/mockito)
-- mockito-junit-jupiter (from https://github.com/mockito/mockito)
-- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
-- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
-- qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)
-- spring-security-core (from https://spring.io/spring-security)
-
-========================================================================
-MPL-1.1
+- numpy (from http://www.numpy.org)
+
+========================================================================
+OpenSSL
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Javassist (from http://www.javassist.org/)
-- Javassist (from http://www.javassist.org/)
+- grpcio (from https://grpc.io)
 
 ========================================================================
-MPL-2.0
+Python-2.0
 ========================================================================
 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 https://square.github.io/okhttp/)
+- async-timeout (from https://github.com/aio-libs/async_timeout/)
+- coverage (from https://github.com/nedbat/coveragepy)
+- distributed (from https://distributed.readthedocs.io/en/latest/)
+- google-auth (from https://github.com/googleapis/google-auth-library-python)
+- google-auth-oauthlib (from https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib)
+- numpy (from http://www.numpy.org)
+- pandas (from http://pandas.pydata.org)
+- ply (from http://www.dabeaz.com/ply/)
+- portalocker (from https://github.com/WoLpH/portalocker)
+- python-dateutil (from https://dateutil.readthedocs.org)
+- pytz (from http://pythonhosted.org/pytz)
+- rsa (from https://stuvel.eu/rsa)
+- sniffio (from https://github.com/python-trio/sniffio)
+- typing-extensions (from https://github.com/python/typing)
+- urllib3 (from https://urllib3.readthedocs.io/)
 
 ========================================================================
-MS-RL
+SunPro
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- numpy (from http://www.numpy.org)
 
 ========================================================================
-Public-Domain
+Unlicense
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- JAXB Reference Implementation (from http://jaxb.java.net/)
-- Old JAXB Core (from https://eclipse-ee4j.github.io/jaxb-ri/)
-- Spongy Castle (from http://rtyley.github.io/spongycastle/)
+- grpcio (from https://grpc.io)
 
 ========================================================================
-SPL-1.0
+WTFPL
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Checker Qual (from https://checkerframework.org)
-- Checker Qual (from https://checkerframework.org)
+- jsonpath-ng (from https://github.com/h2non/jsonpath-ng)
 
 ========================================================================
-SunPro
+ZPL-2.1
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
+- pytz (from http://pythonhosted.org/pytz)
 
 ========================================================================
-WTFPL
+Zlib
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Reflections (from http://github.com/ronmamo/reflections)
+- grpcio (from https://grpc.io)
+- numpy (from http://www.numpy.org)
 
 ========================================================================
 public-domain
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
-- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
-- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- Joda-Time (from https://www.joda.org/joda-time/)
-- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
-- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
-- Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Project Lombok (from http://projectlombok.org)
-- Spring Web (from https://github.com/spring-projects/spring-framework)
-- azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/)
-- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
-- reactive-streams (from http://www.reactive-streams.org/)
-
-========================================================================
-unknown
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
-- Checker Qual (from https://checkerframework.org)
-- JSON in Java (from https://github.com/douglascrockford/JSON-java)
-- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
-- JUnit Jupiter API (from https://junit.org/junit5/)
-- JUnit Jupiter Engine (from https://junit.org/junit5/)
-- JUnit Jupiter Params (from https://junit.org/junit5/)
-- JUnit Platform Commons (from https://junit.org/junit5/)
-- JUnit Platform Engine API (from https://junit.org/junit5/)
-- Spongy Castle (from http://rtyley.github.io/spongycastle/)
+- botocore (from https://github.com/boto/botocore)
+- grpcio (from https://grpc.io)
+- numpy (from http://www.numpy.org)
+- pandas (from http://pandas.pydata.org)
+- py (from http://pylib.readthedocs.org/)
+- pytz (from http://pythonhosted.org/pytz)
 
 
diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java
index bc731b0ff24ce395e6ec2ac528597e6f57f5eb32..d4c30be61a0cbdd14cf41ae5b43f98e1021b2152 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java
@@ -112,6 +112,8 @@ public class AwsPubsubRequestBodyExtractor implements IPubsubRequestBodyExtracto
             throw new AppException(HttpStatus.BAD_REQUEST.value(), INVALID_PUBSUB_MESSAGE,
                     "No tenant information from pubsub message.");
         }
+        String x_user_id= request.getHeader("x-user-id");
+        lowerCase.put("x-user-id",x_user_id);
         content.setAttributes(lowerCase);
 
         String decoded = new String(Base64.getDecoder().decode(data));
diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
index 15bce5ba911fe77c558a75f3dc4a29868d56d0f8..ebc825e80f7089f4c8e77167cd9cead3a0d41334 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
@@ -20,18 +20,31 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opengroup.osdu.notification.util.Config;
-import org.opengroup.osdu.notification.util.AwsTestUtils;
-import org.opengroup.osdu.notification.util.RestDescriptor;
-import org.opengroup.osdu.notification.util.TestUtils;
+import org.opengroup.osdu.core.common.model.http.DpsHeaders;
+import org.opengroup.osdu.core.common.model.notification.HmacSecret;
+import org.opengroup.osdu.core.common.model.notification.Subscription;
+import org.opengroup.osdu.core.common.notification.ISubscriptionService;
+import org.opengroup.osdu.core.common.notification.SubscriptionAPIConfig;
+import org.opengroup.osdu.core.common.notification.SubscriptionException;
+import org.opengroup.osdu.core.common.notification.SubscriptionFactory;
+import org.opengroup.osdu.notification.util.*;
 
 import com.sun.jersey.api.client.ClientResponse;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
 
+    private String subscriptionId = null;
+    private String notificationId = null;
+    private ISubscriptionService awssubscriptionService;
+    private static SubscriptionFactory awsfactory;
     @BeforeClass
     public static void classSetup() throws Exception {
         PubsubEndpointHMACTests.classSetup();
+        SubscriptionAPIConfig config = SubscriptionAPIConfig.builder().rootUrl(Config.Instance().RegisterServicePath).build();
+        awsfactory = new SubscriptionFactory(config);
     }
 
     @AfterClass
@@ -50,10 +63,73 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
         this.testUtils = null;
     }
 
+    @Override
+    protected String getArg() {
+        return this.notificationId;
+    }
+
     @Test
     @Override
     public void should_return401_when_noAccessOnCustomerTenant() throws Exception {
         ClientResponse response = descriptor.runOnCustomerTenant(getArg(), getOsduTenantAdminCredentials());
         assertEquals(error(	response.getEntity(String.class)), 403, response.getStatus());
     }
+
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response =  descriptor.run(getArg(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
+
+
+    @Override
+    protected void createResource() throws Exception {
+        createResourceInPartition(TestUtils.getOsduTenant());
+    }
+
+    private void createResourceInPartition(String partitionId) throws Exception{
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put(DpsHeaders.DATA_PARTITION_ID, partitionId);
+        headers.put(DpsHeaders.AUTHORIZATION, testUtils.getOpsToken());
+        //hardcoding user here for 200 response tests. This is just initializing the subscription creation
+        headers.put("x-user-id", AwsConfig.getAWSCognitoUser());
+        DpsHeaders dpsHeaders = DpsHeaders.createFromMap(headers);
+        awssubscriptionService = awsfactory.create(dpsHeaders);
+
+        Map<String,String> h = dpsHeaders.getHeaders();
+        System.out.println(h);
+
+
+        //Create a new subscription to pub/sub
+        Subscription subscription = new Subscription();
+        subscription.setName("subscription-integration-test-hmac");
+        subscription.setDescription("subscription created for hmac integration test");
+        subscription.setTopic(Config.Instance().Topic);
+        //This seems to be a bug. Dont need to add the string
+        //subscription.setPushEndpoint(Config.Instance().HMACPushUrl + "hmac-integration-test");
+        subscription.setPushEndpoint(Config.Instance().HMACPushUrl);
+        HmacSecret secret = new HmacSecret();
+        secret.setValue(Config.Instance().hmacSecretValue);
+
+        subscription.setSecret(secret);
+        try {
+            Subscription subscriptionCreated = awssubscriptionService.create(subscription);
+
+
+            notificationId = subscriptionCreated.getNotificationId();
+            subscriptionId = subscriptionCreated.getId();
+            Config.Instance().NotificationId = notificationId;
+        }catch (SubscriptionException e){
+            System.out.println("Subscription exception inner response : " + e.getHttpResponse());
+            throw e;
+        }
+    }
+
+    @Override
+    protected void deleteResource() throws Exception {
+        awssubscriptionService.delete(subscriptionId);
+    }
+
 }
\ No newline at end of file