From 90b6a54fa745a0e3bdbd83e034e20a08954fdb01 Mon Sep 17 00:00:00 2001
From: Jonathan Lennox <jonathan.lennox@8x8.com>
Date: Wed, 27 Sep 2023 12:56:42 -0400
Subject: [PATCH 1/3] Update Kotlin to 1.9.10, and related Maven packages.

---
 jitsi-media-transform/pom.xml                     |  5 +++--
 jvb/pom.xml                                       |  4 ++--
 .../main/kotlin/org/jitsi/videobridge/Endpoint.kt |  1 +
 .../jitsi/videobridge/relay/RelayedEndpoint.kt    |  1 +
 .../org/jitsi/videobridge/KotestProjectConfig.kt  |  2 +-
 pom.xml                                           | 15 ++++++++-------
 rtp/spotbugs-exclude.xml                          |  3 +++
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/jitsi-media-transform/pom.xml b/jitsi-media-transform/pom.xml
index 3b6499c91b..1e54e4d958 100644
--- a/jitsi-media-transform/pom.xml
+++ b/jitsi-media-transform/pom.xml
@@ -125,8 +125,9 @@
         </dependency>
         <dependency>
             <groupId>io.mockk</groupId>
-            <artifactId>mockk</artifactId>
-            <version>1.12.4</version>
+            <artifactId>mockk-jvm</artifactId>
+            <version>${mockk.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/jvb/pom.xml b/jvb/pom.xml
index bd813e24fa..0f0cbb501b 100644
--- a/jvb/pom.xml
+++ b/jvb/pom.xml
@@ -209,8 +209,8 @@
     <!-- test -->
     <dependency>
       <groupId>io.mockk</groupId>
-      <artifactId>mockk</artifactId>
-      <version>1.12.4</version>
+      <artifactId>mockk-jvm</artifactId>
+      <version>${mockk.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
index f04ead42b7..610af267db 100644
--- a/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
+++ b/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
@@ -568,6 +568,7 @@ class Endpoint @JvmOverloads constructor(
         }
     }
 
+    @Deprecated("use sendVideoConstraintsV2")
     override fun sendVideoConstraints(maxVideoConstraints: VideoConstraints) {
         // Note that it's up to the client to respect these constraints.
         if (mediaSources.isEmpty()) {
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt
index 3255e4a78e..64abaa4e6e 100644
--- a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt
+++ b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt
@@ -144,6 +144,7 @@ class RelayedEndpoint(
 
     override fun setExtmapAllowMixed(allow: Boolean) = streamInformationStore.setExtmapAllowMixed(allow)
 
+    @Deprecated("use sendVideoConstraintsV2")
     override fun sendVideoConstraints(maxVideoConstraints: VideoConstraints) {
         relay.sendMessage(
             AddReceiverMessage(
diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/KotestProjectConfig.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/KotestProjectConfig.kt
index 24818e67dd..1ad89dcc0f 100644
--- a/jvb/src/test/kotlin/org/jitsi/videobridge/KotestProjectConfig.kt
+++ b/jvb/src/test/kotlin/org/jitsi/videobridge/KotestProjectConfig.kt
@@ -21,7 +21,7 @@ import org.jitsi.metaconfig.MetaconfigSettings
 import org.jitsi.videobridge.metrics.VideobridgeMetricsContainer
 
 class KotestProjectConfig : AbstractProjectConfig() {
-    override fun beforeAll() = super.beforeAll().also {
+    override suspend fun beforeProject() = super.beforeProject().also {
         // The only purpose of config caching is performance. We always want caching disabled in tests (so we can
         // freely modify the config without affecting other tests executing afterwards).
         MetaconfigSettings.cacheEnabled = false
diff --git a/pom.xml b/pom.xml
index 5a8d078d51..e2a72553d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,14 @@
 
     <properties>
         <jetty.version>11.0.14</jetty.version>
-        <kotlin.version>1.6.21</kotlin.version>
-        <kotest.version>5.5.5</kotest.version>
-        <junit.version>5.9.1</junit.version>
-        <jitsi.utils.version>1.0-126-g02b0c86</jitsi.utils.version>
-        <jicoco.version>1.1-126-g1f776be</jicoco.version>
-        <ktlint-maven-plugin.version>1.16.0</ktlint-maven-plugin.version>
-        <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
+        <kotlin.version>1.9.10</kotlin.version>
+        <kotest.version>5.7.2</kotest.version>
+        <junit.version>5.10.0</junit.version>
+        <jitsi.utils.version>1.0-127-g6c65524</jitsi.utils.version>
+        <jicoco.version>1.1-SNAPSHOT</jicoco.version>
+        <mockk.version>1.13.8</mockk.version>
+        <ktlint-maven-plugin.version>2.0.0</ktlint-maven-plugin.version>
+        <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
         <spotbugs.version>4.6.0</spotbugs.version>
         <jersey.version>3.0.10</jersey.version>
         <jackson.version>2.12.4</jackson.version>
diff --git a/rtp/spotbugs-exclude.xml b/rtp/spotbugs-exclude.xml
index b9956fab85..f7cf298ceb 100644
--- a/rtp/spotbugs-exclude.xml
+++ b/rtp/spotbugs-exclude.xml
@@ -30,6 +30,9 @@
 
     <!-- False positives with kotlin 1.5 -->
     <Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE"/>
+
+    <!-- Tests are often testing whether a value is not null, and should throw NPE if not -->
+    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
   </Or>
   <Or>
     <Source name="~.*\.*Test.kt" />

From d76646fa779ffd4e37d8c2faab5e01ca7fe02546 Mon Sep 17 00:00:00 2001
From: Jonathan Lennox <jonathan.lennox@8x8.com>
Date: Wed, 27 Sep 2023 13:32:36 -0400
Subject: [PATCH 2/3] Update jitsi-xmpp-extensions version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e2a72553d9..b49b542e30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>jitsi-xmpp-extensions</artifactId>
-                <version>1.0-75-g4664207</version>
+                <version>1.0-76-ge98f8af</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

From 3d25852915c73be6f0ce86f2dc42e48b12757add Mon Sep 17 00:00:00 2001
From: Jonathan Lennox <jonathan.lennox@8x8.com>
Date: Wed, 27 Sep 2023 16:09:48 -0400
Subject: [PATCH 3/3] Update jicoco version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b49b542e30..1d9a16b7f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <kotest.version>5.7.2</kotest.version>
         <junit.version>5.10.0</junit.version>
         <jitsi.utils.version>1.0-127-g6c65524</jitsi.utils.version>
-        <jicoco.version>1.1-SNAPSHOT</jicoco.version>
+        <jicoco.version>1.1-127-gf49982f</jicoco.version>
         <mockk.version>1.13.8</mockk.version>
         <ktlint-maven-plugin.version>2.0.0</ktlint-maven-plugin.version>
         <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>