From 79bc2ab2cfce40cef00fc11d3749da6bee852937 Mon Sep 17 00:00:00 2001
From: Kazuhiro Sera <seratch@gmail.com>
Date: Thu, 27 Oct 2022 21:12:04 +0900
Subject: [PATCH 1/3] Upgrade GSON and other optional dependencies

---
 bolt-http4k/pom.xml               | 2 +-
 bolt-kotlin-examples/pom.xml      | 2 +-
 bolt-micronaut/pom.xml            | 4 ++--
 bolt-quarkus-examples/pom.xml     | 7 ++++++-
 bolt-spring-boot-examples/pom.xml | 4 ++--
 docs/_config.yml                  | 2 +-
 pom.xml                           | 3 ++-
 slack-api-client/pom.xml          | 2 +-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
index bf4517bc2..3c129aab4 100644
--- a/bolt-http4k/pom.xml
+++ b/bolt-http4k/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <properties>
-        <http4k.version>4.32.2.0</http4k.version>
+        <http4k.version>4.33.1.0</http4k.version>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>
diff --git a/bolt-kotlin-examples/pom.xml b/bolt-kotlin-examples/pom.xml
index fec9a6e9a..83d0573e4 100644
--- a/bolt-kotlin-examples/pom.xml
+++ b/bolt-kotlin-examples/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
+            <version>${logback-slf4j-v2.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
index 51e1af958..1458254d2 100644
--- a/bolt-micronaut/pom.xml
+++ b/bolt-micronaut/pom.xml
@@ -10,8 +10,8 @@
     </parent>
 
     <properties>
-        <micronaut.version>3.7.1</micronaut.version>
-        <micronaut-test-junit5.version>3.5.0</micronaut-test-junit5.version>
+        <micronaut.version>3.7.2</micronaut.version>
+        <micronaut-test-junit5.version>3.7.0</micronaut-test-junit5.version>
         <micronaut-rxjava3.version>2.3.0</micronaut-rxjava3.version>
         <junit5-jupiter.version>5.9.1</junit5-jupiter.version>
         <!-- Note that upgrading this library breaks other dependency resolution -->
diff --git a/bolt-quarkus-examples/pom.xml b/bolt-quarkus-examples/pom.xml
index 7637322ff..4b91e8139 100644
--- a/bolt-quarkus-examples/pom.xml
+++ b/bolt-quarkus-examples/pom.xml
@@ -19,7 +19,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>2.12.0.Final</quarkus.platform.version>
+        <quarkus.platform.version>2.13.3.Final</quarkus.platform.version>
         <mutiny.version>1.6.0</mutiny.version>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
     </properties>
@@ -74,6 +74,11 @@
             <artifactId>quarkus-undertow</artifactId>
             <version>${quarkus.platform.version}</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback-slf4j-v2.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/bolt-spring-boot-examples/pom.xml b/bolt-spring-boot-examples/pom.xml
index a439f7e9c..7a9d4922b 100644
--- a/bolt-spring-boot-examples/pom.xml
+++ b/bolt-spring-boot-examples/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <properties>
-        <spring-boot.version>2.7.4</spring-boot.version>
+        <spring-boot.version>2.7.5</spring-boot.version>
     </properties>
 
     <artifactId>bolt-spring-boot-examples</artifactId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
+            <version>${logback-slf4j-v2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/docs/_config.yml b/docs/_config.yml
index adc84bb01..4c219b834 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,7 +10,7 @@ sdkLatestVersion: 1.26.1
 okhttpVersion: 4.10.0
 slf4jApiVersion: 1.7.36
 kotlinVersion: 1.7.20
-springBootVersion: 2.7.4
+springBootVersion: 2.7.5
 compatibleMicronautVersion: 3.x
 quarkusVersion: 2.12.0.Final
 helidonVersion: 2.5.0
diff --git a/pom.xml b/pom.xml
index c11ecdda4..1f34a08c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <!-- We don't change the versions of servlet API interface to keep the backward compatibility with older versions of them -->
         <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
         <okhttp.version>4.10.0</okhttp.version>
-        <gson.version>2.9.1</gson.version>
+        <gson.version>2.10</gson.version>
         <kotlin.version>1.7.20</kotlin.version>
         <!-- Note that we should not upgrade sfl4j-api to v2 to avoid confusions on the users side.
             see also: https://github.com/slackapi/java-slack-sdk/issues/1034
@@ -68,6 +68,7 @@
         <aws.s3.version>[1.12.62,1.13.0)</aws.s3.version>
         <junit.version>4.13.2</junit.version>
         <logback.version>1.2.11</logback.version>
+        <logback-slf4j-v2.version>1.4.4</logback-slf4j-v2.version>
         <hamcrest.version>[1.3,2.0)</hamcrest.version>
         <mockito-core.version>[4.1.0,5.0.0)</mockito-core.version>
         <jetty-for-tests.version>9.2.27.v20190403</jetty-for-tests.version>
diff --git a/slack-api-client/pom.xml b/slack-api-client/pom.xml
index 3a7d722f7..6d9e1a262 100644
--- a/slack-api-client/pom.xml
+++ b/slack-api-client/pom.xml
@@ -20,7 +20,7 @@
          -->
         <tyrus-standalone-client.version>1.19</tyrus-standalone-client.version>
         <java-websocket.version>1.5.3</java-websocket.version>
-        <jedis.version>4.2.3</jedis.version>
+        <jedis.version>4.3.1</jedis.version>
         <jedis-mock.version>1.0.4</jedis-mock.version>
     </properties>
 

From 6e244fb6256d6c63f84c8b08e15b82a3e3f664cd Mon Sep 17 00:00:00 2001
From: Kazuhiro Sera <seratch@gmail.com>
Date: Mon, 7 Nov 2022 13:15:04 +0900
Subject: [PATCH 2/3] Upgrade optional dependencies

---
 bolt-http4k/pom.xml    | 2 +-
 bolt-ktor/pom.xml      | 2 +-
 bolt-micronaut/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
index 3c129aab4..43da1d625 100644
--- a/bolt-http4k/pom.xml
+++ b/bolt-http4k/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <properties>
-        <http4k.version>4.33.1.0</http4k.version>
+        <http4k.version>4.33.3.0</http4k.version>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>
diff --git a/bolt-ktor/pom.xml b/bolt-ktor/pom.xml
index 168ef177d..5548c5351 100644
--- a/bolt-ktor/pom.xml
+++ b/bolt-ktor/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
-        <ktor.version>2.1.2</ktor.version>
+        <ktor.version>2.1.3</ktor.version>
     </properties>
 
     <pluginRepositories>
diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
index 1458254d2..43823607d 100644
--- a/bolt-micronaut/pom.xml
+++ b/bolt-micronaut/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <properties>
-        <micronaut.version>3.7.2</micronaut.version>
+        <micronaut.version>3.7.3</micronaut.version>
         <micronaut-test-junit5.version>3.7.0</micronaut-test-junit5.version>
         <micronaut-rxjava3.version>2.3.0</micronaut-rxjava3.version>
         <junit5-jupiter.version>5.9.1</junit5-jupiter.version>

From 1168b93a93dbb564c4bf4903cdc1fa5fdbc5f20c Mon Sep 17 00:00:00 2001
From: Kazuhiro Sera <seratch@gmail.com>
Date: Mon, 7 Nov 2022 13:55:42 +0900
Subject: [PATCH 3/3] Fix UnknownPropertyDetectionAdapterFactory errors

---
 .../methods/files_remote_Test.java            |  2 +-
 ...nknownPropertyDetectionAdapterFactory.java | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/slack-api-client/src/test/java/test_with_remote_apis/methods/files_remote_Test.java b/slack-api-client/src/test/java/test_with_remote_apis/methods/files_remote_Test.java
index a924f3f22..2a4661c96 100644
--- a/slack-api-client/src/test/java/test_with_remote_apis/methods/files_remote_Test.java
+++ b/slack-api-client/src/test/java/test_with_remote_apis/methods/files_remote_Test.java
@@ -232,7 +232,7 @@ public void updateAndShare_searchable() throws Exception {
         boolean found = false;
         String query = externalId + ": Seamlessly start a voice call";
         long millis = 0;
-        while (!found && millis < 30 * 1000) {
+        while (!found && millis < 60 * 1000) {
             Thread.sleep(500);
             millis += 500;
             SearchFilesResponse searchResults = slack.methods(userToken).searchFiles(r -> r.query(query));
diff --git a/slack-api-model/src/main/java/com/slack/api/util/json/UnknownPropertyDetectionAdapterFactory.java b/slack-api-model/src/main/java/com/slack/api/util/json/UnknownPropertyDetectionAdapterFactory.java
index 7bda6313f..80dd06212 100644
--- a/slack-api-model/src/main/java/com/slack/api/util/json/UnknownPropertyDetectionAdapterFactory.java
+++ b/slack-api-model/src/main/java/com/slack/api/util/json/UnknownPropertyDetectionAdapterFactory.java
@@ -28,9 +28,24 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
 
             try {
                 // Get reference to the existing boundFields.
-                Field f = delegate.getClass().getDeclaredField("boundFields");
-                f.setAccessible(true);
-                Map boundFields = (Map) f.get(delegate);
+                Class<?> adaptorClass = delegate.getClass();
+                Field boundFieldsField = null;
+                while (boundFieldsField == null && !adaptorClass.equals(Object.class)) {
+                    try {
+                        boundFieldsField = adaptorClass.getDeclaredField("boundFields");
+                    } catch (NoSuchFieldException _ignore) {
+                        // Since GSON v3.10, the internal class hierarchy has been changed
+                        // 1) com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter
+                        // 2) com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter
+                        adaptorClass = adaptorClass.getSuperclass();
+                    }
+                }
+                if (boundFieldsField == null) {
+                    String message = "Failed to find bound fields inside GSON";
+                    throw new IllegalStateException(message);
+                }
+                boundFieldsField.setAccessible(true);
+                Map boundFields = (Map) boundFieldsField.get(delegate);
                 StringBuilder sb = new StringBuilder();
                 for (Object key : boundFields.keySet()) {
                     sb.append(key + ", ");
@@ -53,7 +68,7 @@ public Object get(Object key) {
 
                 };
                 // Finally, push our custom map back using reflection.
-                f.set(delegate, boundFields);
+                boundFieldsField.set(delegate, boundFields);
 
             } catch (Exception e) {
                 // Should never happen if the implementation doesn't change.