SCANNERAPI-181 Update OkHttp to 3.14.0

Author: henryju

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

@@ -40,7 +40,6 @@
 import okhttp3.ConnectionSpec;
 import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
-import okhttp3.internal.tls.OkHostnameVerifier;
 import org.sonarsource.scanner.api.internal.cache.Logger;
 
 import static java.util.Arrays.asList;
@@ -72,7 +71,6 @@ static OkHttpClient create(Logger logger) {
 
     X509TrustManager systemDefaultTrustManager = systemDefaultTrustManager();
     okHttpClientBuilder.sslSocketFactory(systemDefaultSslSocketFactory(systemDefaultTrustManager, logger), systemDefaultTrustManager);
-    okHttpClientBuilder.hostnameVerifier(OkHostnameVerifier.INSTANCE);
 
     // OkHttp detect 'http.proxyHost' java property, but credentials should be filled
     final String proxyUser = System.getProperty("http.proxyUser", "");

batch/pom.xml

@@ -41,11 +41,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-assert</artifactId>
-      <scope>test</scope>
-    </dependency>
-        <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

batch/src/test/java/org/sonarsource/scanner/api/internal/batch/DefaultBatchFactoryTest.java

@@ -24,7 +24,7 @@
 import org.junit.Test;
 import org.sonar.batch.bootstrapper.Batch;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class DefaultBatchFactoryTest {
 

its/it-tests/pom.xml

@@ -57,7 +57,6 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>2.3.0</version>
       <scope>test</scope>
     </dependency>
 

pom.xml

@@ -52,8 +52,8 @@
 
     <!-- used for deployment to SonarSource Artifactory -->
     <gitRepositoryName>sonar-scanner-api</gitRepositoryName>
-    <okhttp.version>3.11.0</okhttp.version>
-    <mockito.version>2.22.0</mockito.version>
+    <okhttp.version>3.14.0</okhttp.version>
+    <mockito.version>2.23.4</mockito.version>
   </properties>
 
   <profiles>
@@ -97,11 +97,6 @@
         <artifactId>commons-io</artifactId>
         <version>2.6</version>
       </dependency>
-      <dependency>
-        <groupId>org.easytesting</groupId>
-        <artifactId>fest-assert</artifactId>
-        <version>1.4</version>
-      </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>okhttp</artifactId>
@@ -150,20 +145,4 @@
     </dependencies>
   </dependencyManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>