SCANJLIB-198 Update okhttp and other libraries

Author: henryju

lib/pom.xml

@@ -61,11 +61,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

lib/src/main/java/org/sonarsource/scanner/lib/internal/OkHttpClientFactory.java

@@ -33,6 +33,7 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -42,8 +43,8 @@
 import javax.net.ssl.X509TrustManager;
 import okhttp3.ConnectionSpec;
 import okhttp3.Credentials;
-import okhttp3.OkHttpClient;
 import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
 import org.sonarsource.scanner.lib.internal.cache.Logger;
 
 import static java.util.Arrays.asList;
@@ -57,7 +58,8 @@ public class OkHttpClientFactory {
   static final String P11KEYSTORE = "PKCS11";
   static final CookieManager COOKIE_MANAGER;
   private static final String PROXY_AUTHORIZATION = "Proxy-Authorization";
-  private static final JavaNetCookieJar COOKIE_JAR;  // use the same cookie jar for all instances
+  // use the same cookie jar for all instances
+  private static final JavaNetCookieJar COOKIE_JAR;
 
   private OkHttpClientFactory() {
     // only statics
@@ -84,7 +86,6 @@ static OkHttpClient create(Logger logger) {
     ConnectionSpec tls = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
       .allEnabledTlsVersions()
       .allEnabledCipherSuites()
-      .supportsTlsExtensions(true)
       .build();
     okHttpClientBuilder.connectionSpecs(asList(tls, ConnectionSpec.CLEARTEXT));
 
@@ -183,7 +184,7 @@ private static synchronized KeyManager[] getDefaultKeyManager(Logger logger) {
     }
   }
 
-  private static KeyStore initKeyStore(Logger logger, final String defaultKeyStore, String defaultKeyStoreType, String defaultKeyStoreProvider, char[] passwd)
+  private static KeyStore initKeyStore(Logger logger, final String defaultKeyStore, String defaultKeyStoreType, String defaultKeyStoreProvider, @Nullable char[] passwd)
     throws KeyStoreException, NoSuchProviderException, IOException, NoSuchAlgorithmException, CertificateException {
     KeyStore ks = null;
     if (!defaultKeyStoreType.isEmpty()) {

pom.xml

@@ -53,7 +53,7 @@
 
     <!-- used for deployment to SonarSource Artifactory -->
     <gitRepositoryName>sonar-scanner-java-library</gitRepositoryName>
-    <okhttp.version>3.14.2</okhttp.version>
+    <okhttp.version>4.10.0</okhttp.version>
     <mockito.version>3.12.4</mockito.version>
   </properties>
 
@@ -67,7 +67,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.8.0</version>
+        <version>2.15.1</version>
       </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
@@ -109,11 +109,6 @@
         <artifactId>mockito-core</artifactId>
         <version>${mockito.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>${mockito.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
@@ -122,7 +117,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.11</version>
+        <version>1.16.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>