diff --git a/NOTICE b/NOTICE
index 71c41dc0f376d48c21e31c6ec45d56ff6952b4b1..394b64760370e599f5951f3ccaf1d3444d26f469 100644
--- a/NOTICE
+++ b/NOTICE
@@ -181,26 +181,35 @@ The following software have components provided under the terms of this license:
 - 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)
-- Mockito (from http://www.mockito.org)
 - Mockito (from http://mockito.org)
 - Mockito (from http://mockito.org)
+- Mockito (from http://www.mockito.org)
 - Msg Simple (from https://github.com/fge/msg-simple)
 - Netty Reactive Streams Implementation (from )
 - Netty/Buffer (from http://netty.io/)
+- Netty/Buffer (from http://netty.io/)
 - Netty/Codec (from )
+- Netty/Codec (from )
+- Netty/Codec/HTTP (from )
 - Netty/Codec/HTTP (from )
 - Netty/Codec/HTTP2 (from )
 - Netty/Codec/Socks (from )
 - Netty/Common (from )
+- Netty/Common (from )
+- Netty/Handler (from )
 - Netty/Handler (from )
 - Netty/Handler/Proxy (from )
 - Netty/Resolver (from )
+- Netty/Resolver (from )
 - Netty/TomcatNative [BoringSSL - Static] (from )
 - Netty/Transport (from http://netty.io/)
+- Netty/Transport (from http://netty.io/)
+- Netty/Transport/Native/Unix/Common (from )
 - Netty/Transport/Native/Unix/Common (from )
 - 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)
@@ -231,7 +240,6 @@ The following software have components provided under the terms of this license:
 - Simple XML (from http://simple.sourceforge.net)
 - SnakeYAML (from http://www.snakeyaml.org)
 - Spatial4J (from http://www.locationtech.org/projects/locationtech.spatial4j)
-- Spatial4J (from http://www.locationtech.org/projects/locationtech.spatial4j)
 - Spring AOP (from https://github.com/spring-projects/spring-framework)
 - Spring Beans (from https://github.com/spring-projects/spring-framework)
 - Spring Boot (from http://projects.spring.io/spring-boot/)
@@ -370,6 +378,7 @@ The following software have components provided under the terms of this license:
 - swagger-models (from )
 - tomcat-annotations-api (from http://tomcat.apache.org/)
 - tomcat-embed-core (from http://tomcat.apache.org/)
+- tomcat-embed-core (from http://tomcat.apache.org/)
 - tomcat-embed-el (from http://tomcat.apache.org/)
 - tomcat-embed-websocket (from http://tomcat.apache.org/)
 - x-content (from https://github.com/elastic/elasticsearch)
@@ -426,6 +435,7 @@ The following software have components provided under the terms of this license:
 - Mockito (from http://www.mockito.org)
 - NanoHttpd-Core (from )
 - Netty/Codec/HTTP (from )
+- Netty/Codec/HTTP (from )
 - Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
 - Protocol Buffers [Util] (from )
 - Reflections (from http://github.com/ronmamo/reflections)
@@ -520,6 +530,7 @@ The following software have components provided under the terms of this license:
 - jersey-ext-bean-validation (from )
 - jersey-spring4 (from )
 - tomcat-embed-core (from http://tomcat.apache.org/)
+- tomcat-embed-core (from http://tomcat.apache.org/)
 
 ========================================================================
 CPL-1.0
@@ -597,6 +608,7 @@ The following software have components provided under the terms of this license:
 - jersey-media-json-jackson (from git://java.net/jersey~code/project/jersey-media-json-jackson)
 - jersey-spring4 (from )
 - tomcat-embed-core (from http://tomcat.apache.org/)
+- tomcat-embed-core (from http://tomcat.apache.org/)
 
 ========================================================================
 GPL-2.0-or-later
@@ -641,6 +653,7 @@ The following software have components provided under the terms of this license:
 - jersey-media-json-jackson (from git://java.net/jersey~code/project/jersey-media-json-jackson)
 - jersey-spring4 (from )
 - tomcat-embed-core (from http://tomcat.apache.org/)
+- tomcat-embed-core (from http://tomcat.apache.org/)
 
 ========================================================================
 GPL-3.0-only
@@ -739,11 +752,13 @@ The following software have components provided under the terms of this license:
 - 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)
 - Mockito (from http://mockito.org)
 - Mockito (from http://www.mockito.org)
+- Mockito (from http://www.mockito.org)
 - Mockito (from http://mockito.org)
 - Netty/Codec/HTTP (from )
+- Netty/Codec/HTTP (from )
+- Netty/Common (from )
 - Netty/Common (from )
 - Project Lombok (from https://projectlombok.org)
 - SLF4J API Module (from http://www.slf4j.org)
diff --git a/pom.xml b/pom.xml
index 22a1cc371e3fd27d910bf76321742401d147fa42..d27511f94bcc278acb991bf77dd64a9188c7d0bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.16.RELEASE</version>
+        <version>2.1.18.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -39,6 +39,12 @@
         <snakeyaml.version>1.26</snakeyaml.version>
         <commons-codec.version>1.14</commons-codec.version>
         <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
+        <httpclient.version>4.5.13</httpclient.version>
+        <woodstox-core.version>5.3.0</woodstox-core.version>
+        <reactor-bom.version>2020.0.0</reactor-bom.version>
+        <log4j-core.version>2.13.2</log4j-core.version>
+        <google-oauth-client.version>1.31.0</google-oauth-client.version>
+        <commons-compress.version>1.20</commons-compress.version>
     </properties>
 
     <licenses>
@@ -57,13 +63,12 @@
         <module>provider/search-azure</module>
         <module>provider/search-ibm</module>
     </modules>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.16.RELEASE</version>
+                <version>2.1.18.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -149,7 +154,7 @@
             <dependency>
                 <groupId>org.locationtech.spatial4j</groupId>
                 <artifactId>spatial4j</artifactId>
-                <version>0.6</version>
+                <version>0.7</version>
             </dependency>
             <dependency>
                 <groupId>com.vividsolutions</groupId>
@@ -201,7 +206,7 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-to-slf4j</artifactId>
-                <version>2.13.2</version>
+                <version>${log4j-core.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -262,17 +267,46 @@
                 <artifactId>hibernate-validator</artifactId>
                 <version>${hibernate-validator.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
+                <version>${woodstox-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-bom</artifactId>
+                <version>${reactor-bom.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.oauth-client</groupId>
+                <artifactId>google-oauth-client</artifactId>
+                <version>${google-oauth-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>${commons-compress.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j-core.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-dependencies</artifactId>
-            <version>2.1.7.RELEASE</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml
index b3ad39f7771844445c1595db73470f08d4765762..e583490a59d429fab05099c37f045ad24bb9bf1b 100644
--- a/provider/search-azure/pom.xml
+++ b/provider/search-azure/pom.xml
@@ -87,6 +87,14 @@
             <artifactId>core-lib-azure</artifactId>
             <version>${osdu.corelibazure.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.projectreactor.netty</groupId>
+            <artifactId>reactor-netty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
@@ -129,11 +137,9 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.locationtech.spatial4j</groupId>
             <artifactId>spatial4j</artifactId>
-            <version>${spatial4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts.io</groupId>
diff --git a/provider/search-ibm/pom.xml b/provider/search-ibm/pom.xml
index 7079057cffef90ed25b5eadc9bf4db74b94e3db9..2e3efdc6cb0072a3d0a03a046518f93deaf584e8 100644
--- a/provider/search-ibm/pom.xml
+++ b/provider/search-ibm/pom.xml
@@ -38,6 +38,12 @@
 			<groupId>org.opengroup.osdu</groupId>
 			<artifactId>search-core</artifactId>
 			<version>0.0.5-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.nimbusds</groupId>
+					<artifactId>nimbus-jose-jwt</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/search-core/pom.xml b/search-core/pom.xml
index a0afc28f84067a341ba0af17388e5d2f0cea9a6d..43cab49df70d91f7472a0364db9b9558014184c2 100644
--- a/search-core/pom.xml
+++ b/search-core/pom.xml
@@ -38,15 +38,10 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <project.main.basedir>${project.basedir}</project.main.basedir>
         <tomcat-embed-core.version>9.0.37</tomcat-embed-core.version>
+        <nimbus-jose-jwt.version>9.1.2</nimbus-jose-jwt.version>
     </properties>
 
       <dependencies>
-          <dependency>
-              <groupId>org.opengroup.osdu</groupId>
-              <artifactId>os-core-common</artifactId>
-              <version>0.3.8</version>
-          </dependency>
-
           <dependency>
               <groupId>javax.el</groupId>
               <artifactId>javax.el-api</artifactId>
@@ -79,6 +74,11 @@
           </dependency>
 
           <!--explicitly load latest compatible version with security fix in it-->
+          <dependency>
+              <groupId>com.nimbusds</groupId>
+              <artifactId>nimbus-jose-jwt</artifactId>
+              <version>${nimbus-jose-jwt.version}</version>
+          </dependency>
           <dependency>
               <groupId>com.fasterxml.jackson.core</groupId>
               <artifactId>jackson-databind</artifactId>
diff --git a/testing/integration-tests/search-test-azure/pom.xml b/testing/integration-tests/search-test-azure/pom.xml
index 1359ad013b9594d10d902e98d88f29bd2dc9da84..ce3832a8866c6fe93964b9e47dfdb54f6a1d80de 100644
--- a/testing/integration-tests/search-test-azure/pom.xml
+++ b/testing/integration-tests/search-test-azure/pom.xml
@@ -132,7 +132,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.13.3</version>
         </dependency>
 
         <dependency>