chore: merge w main

Author: zimeg

.github/CODEOWNERS

@@ -1,6 +1,11 @@
+# Salesforce Open Source project configuration
+# Learn more: https://github.com/salesforce/oss-template
+#ECCN:Open Source
+#GUSINFO:Open Source,Open Source Workflow
+
 # Code owners are the default owners for everything in
 # this repository. The owners listed below will be requested for
 # review when a pull request is opened.
-# To add code owner(s), uncomment the line below and
-# replace the @global-owner users with their GitHub username(s).
-# *       @global-owner1 @global-owner
+# To set code owner(s), replace the team below with either
+# their GitHub username(s) or a GitHub team.
+* @slack-samples/maintainers

.github/workflows/gradle.yml

@@ -2,24 +2,26 @@ name: Lint & Test with Gradle
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
 
 jobs:
   gradle:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: ['11', '17']
+        java-version:
+          - 17
+          - 21
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: 'adopt'
+          distribution: "adopt"
       - name: Lint
         run: gradle spotlessCheck
       - name: Build & Test
-        run: gradle test -x spotlessApply
+        run: gradle test -x spotlessApply --info

.github/workflows/mvn.yml

@@ -2,23 +2,25 @@ name: Lint & Test with Maven
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
 
 jobs:
   mvn:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: ['11', '17']
+        java-version:
+          - 17
+          - 21
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: 'adopt'
+          distribution: "adopt"
       - name: Lint
         run: mvn --batch-mode spotless:check
       - name: Build & Test

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'application'
-	id "com.diffplug.spotless" version "7.1.0"
+	id "com.diffplug.spotless" version "8.1.0"
 }
 
 java {
@@ -13,25 +13,30 @@ repositories {
 }
 
 dependencies {
-	implementation("ch.qos.logback:logback-classic:1.5.18")
+	implementation("ch.qos.logback:logback-classic:1.5.21")
 	// ***** SOCKET MODE DEPENDENCIES ***** -->
-	implementation("com.slack.api:bolt:1.45.3")
-	implementation("com.slack.api:bolt-socket-mode:1.45.3")
+	implementation("com.slack.api:bolt:1.46.0")
+	implementation("com.slack.api:bolt-socket-mode:1.46.0")
 	implementation("javax.websocket:javax.websocket-api:1.1")
 	implementation("org.glassfish.tyrus.bundles:tyrus-standalone-client:(,1.19]")
 	// ***** OAUTH DEPENDENCIES *****
-	implementation("com.slack.api:bolt-jetty:1.45.3")
+	implementation("com.slack.api:bolt-jetty:1.46.0")
 	// ***** TEST DEPENDENCIES *****
-	testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.3')
-	testImplementation('org.mockito:mockito-core:5.18.0')
+	testImplementation('org.junit.jupiter:junit-jupiter-api:6.0.1')
+	testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:6.0.1')
+	testImplementation('org.mockito:mockito-core:5.20.0')
 }
 
 application {
 	mainClass = 'Main'
 }
 
-tasks.named('test') {
-	useJUnit()
+testing {
+	suites {
+		test {
+			useJUnitJupiter()
+		}
+	}
 }
 
 spotless {

pom.xml

@@ -19,12 +19,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.5.4</version>
             </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.45.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <formats>
                         <format>
@@ -66,18 +66,18 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.18</version>
+            <version>1.5.21</version>
         </dependency>
         <!-- ***** SOCKET MODE DEPENDENCIES ***** -->
         <dependency>
             <groupId>com.slack.api</groupId>
             <artifactId>bolt</artifactId>
-            <version>1.45.3</version>
+            <version>1.46.0</version>
         </dependency>
         <dependency>
             <groupId>com.slack.api</groupId>
             <artifactId>bolt-socket-mode</artifactId>
-            <version>1.45.3</version>
+            <version>1.46.0</version>
         </dependency>
         <dependency>
             <groupId>javax.websocket</groupId>
@@ -93,19 +93,19 @@
         <dependency>
             <groupId>com.slack.api</groupId>
             <artifactId>bolt-jetty</artifactId>
-            <version>1.45.3</version>
+            <version>1.46.0</version>
         </dependency>
         <!-- ***** TEST DEPENDENCIES ***** -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.13.3</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.18.0</version>
+            <version>5.20.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>