diff --git a/NOTICE b/NOTICE
index b6300e1c830abf29109d11bdc9dbbb4bd1fb6ef4..6b48d56ce8785a29e1cb9db09de6bd4bc77dcd4b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -67,7 +67,7 @@ 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)
 - 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 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
+- Cloud Key Management Service (KMS) API v1-rev20240801-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
 - Commons Digester (from http://commons.apache.org/digester/)
 - Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
@@ -100,6 +100,9 @@ The following software have components provided under the terms of this license:
 - J2ObjC Annotations (from https://github.com/google/j2objc/)
 - JBoss Logging 3 (from http://www.jboss.org)
 - JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
+- JJWT :: API (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-api)
+- JJWT :: Extensions :: Jackson (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-jackson)
+- JJWT :: Impl (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-impl)
 - JJWT :: Legacy Transitive Dependency Jar (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt)
 - 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, https://urielch.github.io/)
@@ -244,7 +247,6 @@ The following software have components provided under the terms of this license:
 - java-cloudant (from https://cloudant.com)
 - javatuples (from http://www.javatuples.org)
 - javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
-- javax.inject (from http://code.google.com/p/atinject/, https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
 - jose4j (from https://bitbucket.org/b_c/jose4j/)
 - json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath)
 - micrometer-commons (from https://github.com/micrometer-metrics/micrometer)
@@ -459,6 +461,7 @@ ISC
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Java Native Access Platform (from https://github.com/java-native-access/jna)
 - 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)
 
 ========================================================================
@@ -466,6 +469,7 @@ LGPL-2.1-only
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Javassist (from http://www.javassist.org/, https://www.javassist.org/)
 - Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
 - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic)
@@ -479,7 +483,6 @@ LGPL-2.1-or-later
 The following software have components provided under the terms of this license:
 
 - Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
-- Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Javassist (from http://www.javassist.org/, https://www.javassist.org/)
 
 ========================================================================
diff --git a/partition-core/pom.xml b/partition-core/pom.xml
index dcf7706681a5b4c6b6bfbb51b173c8880a91b81b..efcbe7999047e166edb77488806da89a9e72bb86 100644
--- a/partition-core/pom.xml
+++ b/partition-core/pom.xml
@@ -61,7 +61,7 @@
 
 		<dependency>
 			<groupId>org.opengroup.osdu</groupId>
-			<artifactId>os-core-common-spring6</artifactId>
+			<artifactId>os-core-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapper.java b/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapper.java
index a7aecf4df3c052fbaef75d7302d5d2e9e9d2916a..42ae670e340f1e01d93b336afbcaeb45a370c40c 100644
--- a/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapper.java
+++ b/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapper.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.gson.Gson;
-import javassist.NotFoundException;
+import org.opengroup.osdu.core.common.exception.NotFoundException;
 import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.AppException;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapperTest.java b/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapperTest.java
index e3ba0419d728cc3803eb5817f7749ce93302b0e6..f27bc7661f5f68ba504920714928dcfbfe4dd99d 100644
--- a/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapperTest.java
+++ b/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapperTest.java
@@ -18,12 +18,12 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.google.gson.Gson;
-import javassist.NotFoundException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.opengroup.osdu.core.common.exception.NotFoundException;
 import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.AppException;
 import org.springframework.http.HttpHeaders;
diff --git a/pom.xml b/pom.xml
index 37ba72c7ad7fcbb1ce4385a7a9a6e45a894644e4..4e81cdc564dcb6fcec9d9bfd66edd64e3d95752b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.source>17</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <os-core-common.version>0.26.0</os-core-common.version>
+    <os-core-common.version>2.0.0</os-core-common.version>
     <spring-boot.version>3.3.1</spring-boot.version>
     <spring-security.version>6.3.1</spring-security.version>
     <spring-framework.version>6.1.10</spring-framework.version>
@@ -75,7 +75,7 @@
       </dependency>
       <dependency>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-core-common-spring6</artifactId>
+        <artifactId>os-core-common</artifactId>
         <version>${os-core-common.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -87,7 +87,7 @@
       </dependency>
       <dependency>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-core-common-spring6</artifactId>
+        <artifactId>os-core-common</artifactId>
         <version>${os-core-common.version}</version>
         <exclusions>
           <exclusion>
diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml
index f723fb7a46601dc95fa946bc67eab7cecdf9e4b5..895a517af052240828a58e9cc5f6ceab1330f609 100644
--- a/provider/partition-azure/pom.xml
+++ b/provider/partition-azure/pom.xml
@@ -14,7 +14,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <core-lib-azure-spring6.version>0.27.0-rc6</core-lib-azure-spring6.version>
+    <core-lib-azure.version>1.0.0</core-lib-azure.version>
     <junit.version>4.13.2</junit.version>
     <reactor-core.version>3.6.4</reactor-core.version>
     <reactor-netty.version>1.1.17</reactor-netty.version>
@@ -34,8 +34,8 @@
       <!-- Inherit managed dependencies from core-lib-azure -->
       <dependency>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>core-lib-azure-spring6</artifactId>
-        <version>${core-lib-azure-spring6.version}</version>
+        <artifactId>core-lib-azure</artifactId>
+        <version>${core-lib-azure.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -76,8 +76,8 @@
     </dependency>
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
-      <artifactId>core-lib-azure-spring6</artifactId>
-      <version>${core-lib-azure-spring6.version}</version>
+      <artifactId>core-lib-azure</artifactId>
+      <version>${core-lib-azure.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>redisson</artifactId>
diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java
index 529cfe02961a9831e98b0902a42493f20e62d798..94d992f551fbb34ed98c110b102866c4b800a477 100644
--- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java
+++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/AuthorizationServiceTest.java
@@ -24,6 +24,7 @@ import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import io.jsonwebtoken.impl.DefaultClaims;
 import io.jsonwebtoken.impl.DefaultJws;
+import io.jsonwebtoken.impl.DefaultJwsHeader;
 import lombok.Getter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -77,7 +78,7 @@ public class AuthorizationServiceTest {
         map.put("email", email);
         map.put("appcode", appcode);
         map.put("iss", "sauth-preview.slb.com");
-        Jws<Claims> jws = new DefaultJws<>(null, new DefaultClaims(map), null);
+        Jws<Claims> jws = new DefaultJws<>(new DefaultJwsHeader(map), new DefaultClaims(map), "sig");
         return new DummyAuthToken(jws);
     }
 
diff --git a/provider/partition-gc/pom.xml b/provider/partition-gc/pom.xml
index f77373b77debb06f63f8cd34af8ba4218eceeaf7..2bc68d3c8f5872d4c290d9e3f79634df62bbdeab 100644
--- a/provider/partition-gc/pom.xml
+++ b/provider/partition-gc/pom.xml
@@ -45,8 +45,8 @@
     <!-- Internal packages -->
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
-      <artifactId>core-lib-gc-spring6</artifactId>
-      <version>0.26.0</version>
+      <artifactId>core-lib-gc</artifactId>
+      <version>0.27.0-rc7</version>
     </dependency>
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
diff --git a/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java b/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java
index 65c72caf4afd9f3e2179f58dbc39611d504eaf71..e93a05e01a4d52856130a4616a9f9e44e9a1b491 100644
--- a/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java
+++ b/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java
@@ -27,7 +27,8 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Map;
-import javax.validation.Valid;
+
+import jakarta.validation.Valid;
 import org.opengroup.osdu.core.common.model.http.AppError;
 import org.opengroup.osdu.partition.model.PartitionInfo;
 import org.opengroup.osdu.partition.model.Property;