From f62c20fee7b788c4351b67b947a44f45250644c2 Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Sun, 2 Oct 2022 03:53:10 -0400
Subject: [PATCH 1/4] Upgrade First Party Library Dependencies for Release 0.17

---
 provider/notification-gcp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml
index 2291782d..488b946f 100644
--- a/provider/notification-gcp/pom.xml
+++ b/provider/notification-gcp/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-gcp</artifactId>
-            <version>0.16.0</version>
+            <version>0.17.0</version>
         </dependency>
 
         <dependency>
-- 
GitLab


From b51520fae3181bce90f57304870b423b529abe15 Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <Stanislav_Riabokon@epam.com>
Date: Thu, 6 Oct 2022 14:55:26 +0300
Subject: [PATCH 2/4] Fixed tests

---
 notification-core/pom.xml                            | 12 ++++++------
 .../gcp/util/ServiceAccountJwtGcpClientImpl.java     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index 5932e072..94342d95 100644
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -66,7 +66,7 @@
             <version>1.18.8</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
             <version>1.30.1</version>
@@ -80,7 +80,7 @@
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
             <version>1.30.2</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -101,11 +101,11 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.3.0</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-iam</artifactId>
             <version>v1-rev289-1.25.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
@@ -265,11 +265,11 @@
             <classifier>linux-x86_64</classifier>
             <type>jar</type>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>com.google.oauth-client</groupId>
             <artifactId>google-oauth-client</artifactId>
             <version>1.31.5</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java
index 194eee8c..2c5af0c7 100644
--- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java
+++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java
@@ -31,7 +31,7 @@ public class ServiceAccountJwtGcpClientImpl implements IServiceAccountJwtClient
     private final TokenProvider tokenProvider;
 
     public String getIdToken(String tenantName) {
-        log.info("Tenant name received for auth token is: {}", tenantName);
+        log.debug("Tenant name received for auth token is: {}", tenantName);
         return "Bearer " + tokenProvider.getIdToken();
     }
 }
-- 
GitLab


From 37218086d539b6e68a2dcda8e857ce1fad1026c8 Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <Stanislav_Riabokon@epam.com>
Date: Thu, 6 Oct 2022 15:34:09 +0300
Subject: [PATCH 3/4] Fixed denependens

---
 notification-core/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/notification-core/pom.xml b/notification-core/pom.xml
index 94342d95..5932e072 100644
--- a/notification-core/pom.xml
+++ b/notification-core/pom.xml
@@ -66,7 +66,7 @@
             <version>1.18.8</version>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
             <version>1.30.1</version>
@@ -80,7 +80,7 @@
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
             <version>1.30.2</version>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -101,11 +101,11 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.3.0</version>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-iam</artifactId>
             <version>v1-rev289-1.25.0</version>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
@@ -265,11 +265,11 @@
             <classifier>linux-x86_64</classifier>
             <type>jar</type>
         </dependency>
-       <!-- <dependency>
+        <dependency>
             <groupId>com.google.oauth-client</groupId>
             <artifactId>google-oauth-client</artifactId>
             <version>1.31.5</version>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
-- 
GitLab


From de2a3cd6cac6699aec564082ef46f9c2173f71b7 Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <Stanislav_Riabokon@epam.com>
Date: Thu, 6 Oct 2022 15:55:05 +0300
Subject: [PATCH 4/4] Fixed denependens

---
 provider/notification-gcp/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml
index 8ca1df21..ae53288c 100644
--- a/provider/notification-gcp/pom.xml
+++ b/provider/notification-gcp/pom.xml
@@ -53,6 +53,16 @@
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>notification-core</artifactId>
             <version>0.18.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.apis</groupId>
+                    <artifactId>google-api-services-iam</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.oauth-client</groupId>
+                    <artifactId>google-oauth-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-- 
GitLab