Upgrade dependencies

Author: ehartmann

api/pom.xml

@@ -47,6 +47,11 @@
       <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>

api/src/test/java/org/sonarsource/scanner/api/UtilsTest.java

@@ -34,8 +34,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 
 public class UtilsTest {
   @Rule
@@ -76,13 +74,6 @@ public void task_should_not_require_project() {
     assertThat(Utils.taskRequiresProject(props)).isFalse();
   }
 
-  @Test
-  public void delete_quietly() {
-    Path f = mock(Path.class);
-    doThrow(IOException.class).when(f).getFileSystem();
-    Utils.deleteQuietly(f);
-  }
-
   @Test
   public void delete_non_empty_directory() throws IOException {
     /*-

api/src/test/java/org/sonarsource/scanner/api/internal/IsolatedClassloaderTest.java

@@ -19,24 +19,22 @@
  */
 package org.sonarsource.scanner.api.internal;
 
-import org.junit.Before;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashSet;
-
-import static org.mockito.Mockito.when;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonarsource.scanner.api.internal.ClassloadRules;
-import org.sonarsource.scanner.api.internal.IsolatedClassloader;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class IsolatedClassloaderTest {
   @Rule
@@ -79,9 +77,11 @@ public void add_jars() throws MalformedURLException {
   }
 
   @Test
-  public void error_add_jars() {
+  public void error_add_jars() throws MalformedURLException {
     File f = mock(File.class);
-    when(f.toURI()).thenThrow(MalformedURLException.class);
+    URI uri = mock(URI.class);
+    when(f.toURI()).thenReturn(uri);
+    when(uri.toURL()).thenThrow(MalformedURLException.class);
     File[] files = {f};
 
     thrown.expect(IllegalStateException.class);

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>41</version>
+    <version>48</version>
   </parent>
 
   <groupId>org.sonarsource.scanner.api</groupId>
@@ -53,6 +53,7 @@
     <!-- used for deployment to SonarSource Artifactory -->
     <gitRepositoryName>sonar-scanner-api</gitRepositoryName>
     <okhttp.version>3.8.1</okhttp.version>
+    <mockito.version>2.22.0</mockito.version>
   </properties>
 
   <profiles>
@@ -94,7 +95,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.5</version>
+        <version>2.6</version>
       </dependency>
       <dependency>
         <groupId>org.easytesting</groupId>
@@ -109,7 +110,7 @@
       <dependency>
         <groupId>com.eclipsesource.minimal-json</groupId>
         <artifactId>minimal-json</artifactId>
-        <version>0.9.4</version>
+        <version>0.9.5</version>
       </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
@@ -119,7 +120,7 @@
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
-        <version>2.0.3</version>
+        <version>3.0.2</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
@@ -129,17 +130,22 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>2.8.9</version>
+        <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>
-        <version>3.6.2</version>
+        <version>3.11.1</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.10</version>
+        <version>1.11</version>
       </dependency>
     </dependencies>
   </dependencyManagement>