diff --git a/NOTICE b/NOTICE
index dbd3ba70d3c7dcea4d365190827f607dacb878bc..e348e83a60399d324c9d698a14b9d76f3985daab 100644
--- a/NOTICE
+++ b/NOTICE
@@ -28,6 +28,42 @@ The following software have components provided under the terms of this license:
 - AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter)
 - API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common)
 - ASM based accessors helper used by json-smart (from https://urielch.github.io/)
+- AWS Cryptographic Material Providers Library (from https://github.com/aws/aws-cryptographic-material-providers-library)
+- AWS Database Encryption SDK for DynamoDB (from https://github.com/aws/aws-database-encryption-sdk-dynamodb)
+- AWS Event Stream (from https://github.com/awslabs/aws-eventstream-java)
+- AWS Java SDK :: AWS Core (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Annotations (from https://repo1.maven.org/maven2/software/amazon/awssdk/annotations)
+- AWS Java SDK :: Auth (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Checksums (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Checksums SPI (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Core :: Protocols :: AWS Json Protocol (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Core :: Protocols :: AWS Query Protocol (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Core :: Protocols :: Json Utils (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Core :: Protocols :: Protocol Core (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: DynamoDB :: Enhanced Client (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Endpoints SPI (from https://repo1.maven.org/maven2/software/amazon/awssdk/endpoints-spi)
+- AWS Java SDK :: HTTP Auth (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: HTTP Auth AWS (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: HTTP Auth Event Stream (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: HTTP Auth SPI (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: HTTP Client Interface (from https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi)
+- AWS Java SDK :: HTTP Clients :: Apache (from https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client)
+- AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (from https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client)
+- AWS Java SDK :: Identity SPI (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Metrics SPI (from https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi)
+- AWS Java SDK :: Profiles (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Regions (from https://repo1.maven.org/maven2/software/amazon/awssdk/regions)
+- AWS Java SDK :: Retries (from https://repo1.maven.org/maven2/software/amazon/awssdk/retries)
+- AWS Java SDK :: Retries API (from https://repo1.maven.org/maven2/software/amazon/awssdk/retries-spi)
+- AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Services :: AWS KMS (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Services :: AWS STS (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Services :: AWS Secrets Manager (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Services :: AWS Simple Systems Management (SSM) (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Services :: Amazon DynamoDB (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Third Party :: Jackson-core (from https://aws.amazon.com/sdkforjava)
+- AWS Java SDK :: Utilities (from https://repo1.maven.org/maven2/software/amazon/awssdk/utils)
 - AWS Java SDK for AWS KMS (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)
@@ -112,7 +148,7 @@ The following software have components provided under the terms of this license:
 - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310, https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
 - Jackson datatype: Joda (from http://wiki.fasterxml.com/JacksonModuleJoda, https://github.com/FasterXML/jackson-datatype-joda)
 - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
-- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson)
+- Jackson-annotations (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome)
 - Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core)
 - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson, https://github.com/FasterXML/jackson-dataformats-text)
 - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
@@ -174,6 +210,7 @@ The following software have components provided under the terms of this license:
 - Redisson (from http://redisson.org, https://redisson.pro)
 - Retrofit (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
 - RxJava (from https://github.com/ReactiveX/RxJava)
+- Smithy :: Dafny :: Conversion (from https://github.com/smithy-lang/smithy)
 - SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml)
 - Spring AOP (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-aop)
 - Spring Beans (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-beans)
@@ -325,6 +362,13 @@ The following software have components provided under the terms of this license:
 - ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp)
 - google (from http://breakingcode.wordpress.com/)
 
+========================================================================
+BouncyCastle
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/download/bouncy-castle-java/, https://www.bouncycastle.org/java.html)
+
 ========================================================================
 CC-BY-2.5
 ========================================================================
@@ -504,6 +548,7 @@ The following software have components provided under the terms of this license:
 - Cucumber-JVM: Java (from https://repo1.maven.org/maven2/io/cucumber/cucumber-java)
 - Cucumber-JVM: Plugin (from https://repo1.maven.org/maven2/io/cucumber/cucumber-plugin)
 - Cucumber-JVN: DataTable (from https://repo1.maven.org/maven2/io/cucumber/datatable)
+- DafnyRuntime (from https://github.com/dafny-lang/dafny)
 - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
 - Gherkin (from https://github.com/cucumber/gherkin)
 - Google Guice - Core Library (from https://repo1.maven.org/maven2/com/google/inject/guice)
diff --git a/provider/schema-aws/pom.xml b/provider/schema-aws/pom.xml
index e51e4dc1832b3fbdea3d0e2964d3302e5bc02229..c2b89cf43f14f73b94fa0ade10e1e456d7c8f1ee 100644
--- a/provider/schema-aws/pom.xml
+++ b/provider/schema-aws/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>3.0.2</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
diff --git a/testing/schema-test-core/pom.xml b/testing/schema-test-core/pom.xml
index 7476b71ffe1d976dc77c09d317d418618e82879e..561e3abead2114532cb868c75391ae747d8e6a27 100644
--- a/testing/schema-test-core/pom.xml
+++ b/testing/schema-test-core/pom.xml
@@ -12,7 +12,7 @@
 	<properties>
 		<os-core-lib-ibm.version>0.26.0-rc8</os-core-lib-ibm.version>
 		<os-core-lib-azure.version>0.26.0</os-core-lib-azure.version>
-		<os-core-lib-aws.version>0.26.0-spring6-rc1</os-core-lib-aws.version>
+		<os-core-lib-aws.version>4.0.0</os-core-lib-aws.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jackson-databind.version>2.14.2</jackson-databind.version>
 		<jackson.version>2.14.2</jackson.version>