Merge branch 'main' into remote-functions-2

seratch · web-flow · commit 0f27992dc23b · 2024-05-12T09:11:19.000+09:00
diff --git a/bolt-aws-lambda/pom.xml b/bolt-aws-lambda/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
         <aws-lambda-core.version>1.2.3</aws-lambda-core.version>
     </properties>
 
     <artifactId>bolt-aws-lambda</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-docker-examples/echo-command-app/build.gradle b/bolt-docker-examples/echo-command-app/build.gradle
@@ -10,7 +10,7 @@ repositories {
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("com.slack.api:bolt-jetty:1.39.0")
+    implementation("com.slack.api:bolt-jetty:1.39.1")
     implementation("ch.qos.logback:logback-classic:1.2.11")
     implementation('net.logstash.logback:logstash-logback-encoder:6.2')
 }
diff --git a/bolt-google-cloud-functions/pom.xml b/bolt-google-cloud-functions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-google-cloud-functions</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-helidon/pom.xml b/bolt-helidon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -18,7 +18,7 @@
     </properties>
 
     <artifactId>bolt-helidon</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <http4k.version>5.16.2.0</http4k.version>
+        <http4k.version>5.18.2.0</http4k.version>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>
diff --git a/bolt-jakarta-jetty/pom.xml b/bolt-jakarta-jetty/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-jetty</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-jakarta-servlet/pom.xml b/bolt-jakarta-servlet/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-servlet</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-jetty/pom.xml b/bolt-jetty/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
         <jetty.version>9.4.53.v20231009</jetty.version>
     </properties>
 
     <artifactId>bolt-jetty</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-kotlin-examples/pom.xml b/bolt-kotlin-examples/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-kotlin-examples</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-ktor/pom.xml b/bolt-ktor/pom.xml
@@ -5,17 +5,17 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-ktor</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
-        <ktor.version>2.3.10</ktor.version>
+        <ktor.version>2.3.11</ktor.version>
     </properties>
 
     <pluginRepositories>
diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <micronaut.version>4.4.6</micronaut.version>
+        <micronaut.version>4.4.9</micronaut.version>
         <micronaut-test-junit5.version>4.3.0</micronaut-test-junit5.version>
         <micronaut-rxjava3.version>3.3.0</micronaut-rxjava3.version>
         <junit5-jupiter.version>5.10.2</junit5-jupiter.version>
@@ -25,7 +25,7 @@
     </properties>
 
     <artifactId>bolt-micronaut</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-quarkus-examples/pom.xml b/bolt-quarkus-examples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -24,7 +24,7 @@
     </properties>
 
     <artifactId>bolt-quarkus-examples</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>
diff --git a/bolt-servlet/pom.xml b/bolt-servlet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -15,7 +15,7 @@
     </properties>
 
     <artifactId>bolt-servlet</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-socket-mode/pom.xml b/bolt-socket-mode/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-socket-mode</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt/pom.xml b/bolt/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/bolt/src/main/java/com/slack/api/bolt/meta/BoltLibraryVersion.java b/bolt/src/main/java/com/slack/api/bolt/meta/BoltLibraryVersion.java
@@ -5,7 +5,7 @@ private BoltLibraryVersion() {
     }
 
     public static final String get() {
-        return "1.39.1-SNAPSHOT";
+        return "1.39.2-SNAPSHOT";
     }
 }
 
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -6,7 +6,7 @@ markdown: kramdown
 baseurl: /java-slack-sdk
 url: https://slack.dev
 
-sdkLatestVersion: 1.39.0
+sdkLatestVersion: 1.39.1
 okhttpVersion: 4.10.0
 slf4jApiVersion: 1.7.36
 kotlinVersion: 1.7.21
diff --git a/json-logs/raw/audit/v1/actions.json b/json-logs/raw/audit/v1/actions.json
@@ -189,7 +189,11 @@
       "pref.flag_content_review_note_required",
       "pref.invited_user_preset",
       "pref.max_guest_duration",
-      "pref.sso_sync_with_provider"
+      "pref.sso_sync_with_provider",
+      "quip_migration_org_mapping_removed",
+      "quip_migration_org_mapping_added",
+      "organization_channel_audit_export_enabled",
+      "workspace_channel_audit_export_enabled"
     ],
     "user": [
       "custom_tos_accepted",
@@ -228,7 +232,9 @@
       "user_password_reset_requested",
       "user_profile_updated",
       "user_profile_deleted",
-      "user_password_reset_slack_security"
+      "user_password_reset_slack_security",
+      "quip_migration_user_mapping_removed",
+      "quip_migration_user_mapping_added"
     ],
     "file": [
       "file_downloaded",
@@ -436,7 +442,8 @@
       "canvas_unshared",
       "canvas_converted_to_template",
       "canvas_template_used",
-      "canvas_template_reverted"
+      "canvas_template_reverted",
+      "canvas_quip_document_cloned"
     ],
     "function": [
       "function_distribution_permission_added",
diff --git a/json-logs/samples/api/admin.inviteRequests.approved.list.json b/json-logs/samples/api/admin.inviteRequests.approved.list.json
@@ -37,5 +37,8 @@
   ],
   "error": "",
   "needed": "",
-  "provided": ""
+  "provided": "",
+  "response_metadata": {
+    "next_cursor": ""
+  }
 }
diff --git a/json-logs/samples/api/admin.inviteRequests.denied.list.json b/json-logs/samples/api/admin.inviteRequests.denied.list.json
@@ -23,5 +23,8 @@
   ],
   "error": "",
   "needed": "",
-  "provided": ""
+  "provided": "",
+  "response_metadata": {
+    "next_cursor": ""
+  }
 }
diff --git a/json-logs/samples/api/admin.inviteRequests.list.json b/json-logs/samples/api/admin.inviteRequests.list.json
@@ -18,5 +18,8 @@
   ],
   "error": "",
   "needed": "",
-  "provided": ""
+  "provided": "",
+  "response_metadata": {
+    "next_cursor": ""
+  }
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.slack.api</groupId>
     <artifactId>slack-sdk-parent</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Java Slack SDK Project</name>
@@ -51,7 +51,7 @@
         <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
         <okhttp.version>4.12.0</okhttp.version>
         <gson.version>2.10.1</gson.version>
-        <kotlin.version>1.9.23</kotlin.version>
+        <kotlin.version>1.9.24</kotlin.version>
         <!-- Allow use by clients on earlier versions of Kotlin-->
         <kotlin.compiler.apiVersion>1.6</kotlin.compiler.apiVersion>
         <kotlin.compiler.languageVersion>1.6</kotlin.compiler.languageVersion>
diff --git a/slack-api-client-kotlin-extension/pom.xml b/slack-api-client-kotlin-extension/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>slack-api-client-kotlin-extension</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/slack-api-client/pom.xml b/slack-api-client/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.1-SNAPSHOT</version>
+        <version>1.39.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>slack-api-client</artifactId>
-    <version>1.39.1-SNAPSHOT</version>
+    <version>1.39.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -21,7 +21,7 @@
         <tyrus-standalone-client.version>1.20</tyrus-standalone-client.version>
         <java-websocket.version>1.5.6</java-websocket.version>
         <jedis.version>5.1.2</jedis.version>
-        <jedis-mock.version>1.1.0</jedis-mock.version>
+        <jedis-mock.version>1.1.1</jedis-mock.version>
     </properties>
 
     <dependencies>
diff --git a/slack-api-client/src/main/java/com/slack/api/audit/Actions.java b/slack-api-client/src/main/java/com/slack/api/audit/Actions.java
diff --git a/slack-api-client/src/main/java/com/slack/api/meta/SlackApiClientLibraryVersion.java b/slack-api-client/src/main/java/com/slack/api/meta/SlackApiClientLibraryVersion.java
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/invite_requests/AdminInviteRequestsApprovedListResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/invite_requests/AdminInviteRequestsApprovedListResponse.java
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/invite_requests/AdminInviteRequestsDeniedListResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/invite_requests/AdminInviteRequestsDeniedListResponse.java
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/invite_requests/AdminInviteRequestsListResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/invite_requests/AdminInviteRequestsListResponse.java
diff --git a/slack-api-client/src/test/java/test_with_remote_apis/methods_admin_api/AdminApi_inviteRequests_Test.java b/slack-api-client/src/test/java/test_with_remote_apis/methods_admin_api/AdminApi_inviteRequests_Test.java
diff --git a/slack-api-model-kotlin-extension/pom.xml b/slack-api-model-kotlin-extension/pom.xml
diff --git a/slack-api-model/pom.xml b/slack-api-model/pom.xml
diff --git a/slack-api-model/src/main/java/com/slack/api/meta/SlackApiModelLibraryVersion.java b/slack-api-model/src/main/java/com/slack/api/meta/SlackApiModelLibraryVersion.java
diff --git a/slack-app-backend/pom.xml b/slack-app-backend/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ repositories {`
`10`	`10`	`dependencies {`
`11`	`11`	`implementation(platform("org.jetbrains.kotlin:kotlin-bom"))`
`12`	`12`	`implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")`
`13`		`- implementation("com.slack.api:bolt-jetty:1.39.0")`
	`13`	`+ implementation("com.slack.api:bolt-jetty:1.39.1")`
`14`	`14`	`implementation("ch.qos.logback:logback-classic:1.2.11")`
`15`	`15`	`implementation('net.logstash.logback:logstash-logback-encoder:6.2')`
`16`	`16`	`}`