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 @@ io.mockk - mockk - 1.12.4 + mockk-jvm + ${mockk.version} + test javax.xml.bind 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 @@ io.mockk - mockk - 1.12.4 + mockk-jvm + ${mockk.version} test 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..1d9a16b7f2 100644 --- a/pom.xml +++ b/pom.xml @@ -24,13 +24,14 @@ 11.0.14 - 1.6.21 - 5.5.5 - 5.9.1 - 1.0-126-g02b0c86 - 1.1-126-g1f776be - 1.16.0 - 3.2.2 + 1.9.10 + 5.7.2 + 5.10.0 + 1.0-127-g6c65524 + 1.1-127-gf49982f + 1.13.8 + 2.0.0 + 3.5.1 4.6.0 3.0.10 2.12.4 @@ -110,7 +111,7 @@ ${project.groupId} jitsi-xmpp-extensions - 1.0-75-g4664207 + 1.0-76-ge98f8af 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 @@ + + +