Update many dependencies and plugins. (#2364)

* Bump Kotlin version, fix some warnings.

* Update some dependencies to fix some bugs.

* Update SpotBugs; update suppressions accordingly (and fix some bugs it found).

* Bump maven-source-plugin version.

* Bump maven-compiler-plugin version.

* Bump maven-assembly-plugin version.

* Bump maven-enforcer-plugin version.

* Bump jacoco version.

* Bump spotbugs-maven-plugin version.

* Bump maven-surefire-plugin version.

* Bump exec-maven-plugin version.

* Bump build-helper-maven-plugin version.

* Bump Kotlin version again.

* Bump maven-jar-plugin version.

* Set a phase for attach-sources action.

Otherwise it complains if you pass maven multiple targets.

* Use variables for plugin versions used in more than one pom file.

Author: JonathanLennox

jitsi-media-transform/pom.xml

@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>
@@ -92,6 +92,12 @@
             <version>3.0.10</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.kotest</groupId>
             <artifactId>kotest-runner-junit5-jvm</artifactId>
@@ -169,7 +175,7 @@
                 <!-- To try and get both java and kotlin sources in the sources jar -->
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>${build-helper-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -188,10 +194,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>verify</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>
@@ -203,7 +210,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <executions>
                     <!-- Replacing default-compile as it is treated specially by maven -->
                     <execution>
@@ -233,7 +240,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <systemPropertyVariables>
                         <kotest.framework.classpath.scanning.autoscan.disable>true</kotest.framework.classpath.scanning.autoscan.disable>
@@ -283,7 +290,7 @@
           <plugin>
               <groupId>com.github.spotbugs</groupId>
               <artifactId>spotbugs-maven-plugin</artifactId>
-              <version>4.8.5.0</version>
+              <version>${spotbugs-maven-plugin.version}</version>
               <configuration>
                   <excludeFilterFile>${project.basedir}/spotbugs-exclude.xml</excludeFilterFile>
                   <includeTests>true</includeTests>
@@ -335,9 +342,6 @@
     <profiles>
         <profile>
             <id>coverage</id>
-            <properties>
-                <jacoco.version>0.8.8</jacoco.version>
-            </properties>
             <build>
                 <plugins>
                     <plugin>

jitsi-media-transform/spotbugs-exclude.xml

@@ -11,7 +11,10 @@
     <!-- We expose arrays in multiple places on purpose. -->
     <Bug pattern="EI_EXPOSE_REP"/>
     <Bug pattern="EI_EXPOSE_REP2"/>
-
+    <!-- We throw from constructors on illegal arguments, i.e. programming errors. -->
+    <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    <!-- We don't expect to run on 32-bit platforms. -->
+    <Bug pattern="AT_NONATOMIC_64BIT_PRIMITIVE"/>
   </Or>
 </Match>
 
@@ -30,6 +33,7 @@
     <Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE"/>
     <!-- False positives with kotlin's "when" -->
     <Bug pattern="SF_SWITCH_NO_DEFAULT"/>
+    <Bug pattern="SF_SWITCH_FALLTHROUGH"/>
     <!-- False positives with lazy vals -->
     <Bug pattern="NP_NULL_ON_SOME_PATH"/>
     <!-- False positives with lazy vals -->
@@ -44,11 +48,12 @@
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     <Bug pattern="UR_UNINIT_READ"/>
     <Bug pattern="UC_USELESS_OBJECT"/>
+    <Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
+    <Bug pattern="MS_EXPOSE_REP"/>
   </Or>
   <Source name="~.*\.kt" />
 </Match>
 
-
 <!-- Tests -->
 <Match>
   <Or>

jitsi-media-transform/src/main/java/org/jitsi_modified/impl/neomedia/rtp/remotebitrateestimator/RateControlInput.java

@@ -15,11 +15,14 @@
  */
 package org.jitsi_modified.impl.neomedia.rtp.remotebitrateestimator;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
  *
  * @author Lyubomir Marinov
  */
+@SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
 class RateControlInput
 {
     public BandwidthUsage bwState;

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/MediaSourceDesc.kt

@@ -15,7 +15,6 @@
  */
 package org.jitsi.nlj
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import org.jitsi.nlj.rtp.VideoRtpPacket
 import org.jitsi.nlj.util.Bandwidth
 import org.jitsi.nlj.util.bps
@@ -35,10 +34,6 @@ import java.util.TreeMap
  *
  * @author George Politis
  */
-@SuppressFBWarnings(
-    value = ["NP_ALWAYS_NULL"],
-    justification = "False positives with 'lateinit'."
-)
 class MediaSourceDesc
 @JvmOverloads constructor(
     /**

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/RtpLayerDesc.kt

@@ -192,7 +192,6 @@ abstract class RtpLayerDesc(
         /**
          * Get a string description of a layer index.
          */
-        @JvmStatic
         fun indexString(index: Int): String = if (index == SUSPENDED_INDEX) {
             "SUSP"
         } else {

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/DtlsConfig.kt

@@ -22,7 +22,7 @@ import org.jitsi.metaconfig.ConfigException
 import org.jitsi.metaconfig.config
 import java.time.Duration
 
-class DtlsConfig {
+class DtlsConfig private constructor() {
     val handshakeTimeout: Duration by config {
         "jmt.dtls.handshake-timeout".from(JitsiConfig.newConfig)
     }

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/DtlsUtils.kt

@@ -59,13 +59,11 @@ class DtlsUtils {
             Security.addProvider(BouncyCastleProvider())
         }
 
-        val config = DtlsConfig()
-
         fun generateCertificateInfo(): CertificateInfo {
             val cn = generateCN("TODO-APP-NAME", "TODO-APP-VERSION")
             val keyPair = generateEcKeyPair()
             val x509certificate = generateCertificate(cn, keyPair)
-            val localFingerprintHashFunction = config.localFingerprintHashFunction
+            val localFingerprintHashFunction = DtlsConfig.config.localFingerprintHashFunction
             val localFingerprint = x509certificate.getFingerprint(localFingerprintHashFunction)
 
             val certificate = org.bouncycastle.tls.Certificate(
@@ -188,7 +186,7 @@ class DtlsUtils {
              *    preferred hash function (out of those offered by the peer) and verify
              *    that each certificate used matches one fingerprint out of that set.
              */
-            config.acceptedFingerprintHashFunctions.forEach { hashFunction ->
+            DtlsConfig.config.acceptedFingerprintHashFunctions.forEach { hashFunction ->
                 val fingerprints = remoteFingerprints[hashFunction] ?: return@forEach
 
                 val certificateFingerprint = certificate.getFingerprint(hashFunction)
@@ -204,7 +202,7 @@ class DtlsUtils {
             /* If we got here none of our accepted fingerprint functions were listed. */
             throw DtlsException(
                 "No fingerprint declared over the signaling path with any of the accepted hash functions: " +
-                    config.acceptedFingerprintHashFunctions.joinToString()
+                    DtlsConfig.config.acceptedFingerprintHashFunctions.joinToString()
             )
         }
 

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/TlsClientImpl.kt

@@ -15,7 +15,6 @@
  */
 package org.jitsi.nlj.dtls
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import org.bouncycastle.crypto.util.PrivateKeyFactory
 import org.bouncycastle.tls.Certificate
 import org.bouncycastle.tls.CertificateRequest
@@ -49,10 +48,6 @@ import java.util.Hashtable
 /**
  * Implementation of [DefaultTlsClient].
  */
-@SuppressFBWarnings(
-    value = ["NP_ALWAYS_NULL"],
-    justification = "False positives with 'lateinit'."
-)
 class TlsClientImpl(
     private val certificateInfo: CertificateInfo,
     /**
@@ -72,6 +67,7 @@ class TlsClientImpl(
      * Only set after a handshake has completed
      */
     lateinit var srtpKeyingMaterial: ByteArray
+        private set
 
     var chosenSrtpProtectionProfile: Int = 0
 
@@ -133,7 +129,7 @@ class TlsClientImpl(
 
     override fun getCipherSuites() = DtlsConfig.config.cipherSuites.toIntArray()
 
-    override fun getHandshakeTimeoutMillis(): Int = DtlsUtils.config.handshakeTimeout.toMillis().toInt()
+    override fun getHandshakeTimeoutMillis(): Int = DtlsConfig.config.handshakeTimeout.toMillis().toInt()
 
     override fun notifyHandshakeComplete() {
         super.notifyHandshakeComplete()

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/TlsServerImpl.kt

@@ -16,7 +16,6 @@
 
 package org.jitsi.nlj.dtls
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import org.bouncycastle.crypto.util.PrivateKeyFactory
 import org.bouncycastle.tls.Certificate
 import org.bouncycastle.tls.CertificateRequest
@@ -47,10 +46,6 @@ import java.nio.ByteBuffer
 import java.util.Hashtable
 import java.util.Vector
 
-@SuppressFBWarnings(
-    value = ["NP_ALWAYS_NULL"],
-    justification = "False positives with 'lateinit'."
-)
 class TlsServerImpl(
     private val certificateInfo: CertificateInfo,
     /**
@@ -68,6 +63,7 @@ class TlsServerImpl(
      * Only set after a handshake has completed
      */
     lateinit var srtpKeyingMaterial: ByteArray
+        private set
 
     var chosenSrtpProtectionProfile: Int = 0
 
@@ -124,7 +120,7 @@ class TlsServerImpl(
         return CertificateRequest(shortArrayOf(ClientCertificateType.ecdsa_sign), signatureAlgorithms, null)
     }
 
-    override fun getHandshakeTimeoutMillis(): Int = DtlsUtils.config.handshakeTimeout.toMillis().toInt()
+    override fun getHandshakeTimeoutMillis(): Int = DtlsConfig.config.handshakeTimeout.toMillis().toInt()
 
     override fun notifyHandshakeComplete() {
         super.notifyHandshakeComplete()

jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtcp/NackHandler.kt

@@ -15,7 +15,6 @@
  */
 package org.jitsi.nlj.rtcp
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import org.jitsi.nlj.PacketHandler
 import org.jitsi.nlj.PacketInfo
 import org.jitsi.nlj.PacketOrigin
@@ -36,10 +35,6 @@ import java.time.Instant
  * When a nack packet is received, the [NackHandler] will try to retrieve the
  * nacked packets from the cache and then send them to the RTX output pipeline.
  */
-@SuppressFBWarnings(
-    value = ["RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"],
-    justification = "False positives."
-)
 class NackHandler(
     private val packetCache: PacketCache,
     private val onNackedPacketsReady: PacketHandler,