Fix build (#500)

* fix javadoc task failing

* Bump mockito, delete unneeded wrapper, get build to pass

* add check for stone submodule for more clear error message

* revert setting kotlin version

* Update CHANGELOG.md

---------

Co-authored-by: Jay Palacio <jpalacio@dropbox.com>

Author: devPalacio

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.4.6-SNAPSHOT
+- Added better error messaging when trying to build the project without submodules initialized.
+- Removed obsolete javadoc flag
+- Updated test dependencies
+- Removed redundant gradle wrappers
+
 ## 5.4.5 (2023-05-16)
 - Update jackson-core to 2.15.0 [#492](https://github.com/dropbox/dropbox-sdk-java/issues/476)
 

dropbox-sdk-java/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
     id "com.vanniktech.maven.publish"
     id "com.github.ben-manes.versions"
-    id("com.dropbox.dependency-guard")
+    id "com.dropbox.dependency-guard"
     id "com.dropbox.stone.java"
     id "org.jetbrains.kotlinx.binary-compatibility-validator"
 }
@@ -48,7 +48,7 @@ dependencies {
     compileOnly(dropboxJavaSdkLibs.appengine.api)
 
     testImplementation 'org.testng:testng:6.9.10'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:5.4.0'
     testImplementation 'org.openjdk.jmh:jmh-core:1.12'
     testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.12'
     testImplementation 'com.google.appengine:appengine-api-1.0-sdk:1.9.38'
@@ -187,8 +187,7 @@ javadoc {
     if (JavaVersion.current().isJava8Compatible()) {
         options.addBooleanOption "Xdoclint:all,-missing", true
     }
-    options.addBooleanOption('-no-module-directories', true)
-    options.addStringOption "link", "http://docs.oracle.com/javase/6/docs/api/"
+    options.addStringOption "link", "http://docs.oracle.com/javase/8/docs/api/"
 }
 
 jar {

dropbox-sdk-java/src/test/java/com/dropbox/core/DbxAuthFinishTest.java

@@ -11,8 +11,8 @@
 import java.util.Locale;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -214,7 +214,7 @@ public void testFinishWithState() throws Exception {
                 .thenReturn(body);
         when(mockUploader.finish())
                 .thenReturn(finishResponse);
-        when(mockRequestor.startPost(anyString(), anyListOf(HttpRequestor.Header.class)))
+        when(mockRequestor.startPost(anyString(), anyList()))
                 .thenReturn(mockUploader);
 
         DbxRequestConfig mockConfig = CONFIG.copy()

dropbox-sdk-java/src/test/java/com/dropbox/core/DbxPKCEWebAuthTest.java

@@ -17,8 +17,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
@@ -89,7 +89,7 @@ public void testCodeVerifier() throws Exception{
                 .thenReturn(body);
         when(mockUploader.finish())
                 .thenReturn(finishResponse);
-        when(mockRequestor.startPost(anyString(), anyListOf(HttpRequestor.Header.class)))
+        when(mockRequestor.startPost(anyString(), anyList()))
                 .thenReturn(mockUploader);
 
         DbxRequestConfig mockConfig = CONFIG.copy()
@@ -199,7 +199,7 @@ public void testInvalidCodeVerifier() throws Exception{
         HttpRequestor.Uploader mockUploader = mock(HttpRequestor.Uploader.class);
         when(mockUploader.finish())
             .thenReturn(finishResponse);
-        when(mockRequestor.startPost(anyString(), anyListOf(HttpRequestor.Header.class)))
+        when(mockRequestor.startPost(anyString(), anyList()))
             .thenReturn(mockUploader);
 
         DbxRequestConfig mockConfig = CONFIG.copy()

dropbox-sdk-java/src/test/java/com/dropbox/core/oauth/DbxRefreshTest.java

@@ -20,8 +20,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -81,7 +81,7 @@ public static DbxRequestConfig setupMockRequestConfig(
         IOException {
         HttpRequestor mockRequestor = mock(HttpRequestor.class);
         when(mockUploader.finish()).thenReturn(response);
-        when(mockRequestor.startPost(anyString(), anyListOf(HttpRequestor.Header.class)))
+        when(mockRequestor.startPost(anyString(), anyList()))
             .thenReturn(mockUploader);
 
         return CONFIG.copy().withHttpRequestor(mockRequestor).build();

dropbox-sdk-java/src/test/java/com/dropbox/core/v1/DbxClientV1Test.java

@@ -12,9 +12,9 @@
 import com.dropbox.core.RetryException;
 import com.dropbox.core.util.IOUtil;
 
+import org.mockito.ArgumentMatchers;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.mockito.Matchers;
 import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
@@ -184,7 +184,7 @@ private static HttpRequestor.Response createEmptyResponse(int statusCode) {
         return new HttpRequestor.Response(
             statusCode,
             new ByteArrayInputStream(body),
-            Collections.<String,List<String>>emptyMap()
+            Collections.emptyMap()
         );
     }
 
@@ -248,6 +248,6 @@ private static Map<String, List<String>> headers(String name, String value, Stri
     }
 
     private static Iterable<HttpRequestor.Header> anyHeaders() {
-        return Matchers.<Iterable<HttpRequestor.Header>>any();
+        return ArgumentMatchers.anyIterable();
     }
 }

dropbox-sdk-java/src/test/java/com/dropbox/core/v2/DbxClientV2Test.java

@@ -13,16 +13,14 @@
 import com.dropbox.core.v2.files.FileMetadata;
 import com.dropbox.core.v2.files.Metadata;
 
+import org.mockito.ArgumentMatchers;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.mockito.Matchers;
 
 import org.testng.annotations.Test;
 
-import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
@@ -693,7 +691,7 @@ private static Map<String, List<String>> headers(String name, String value, Stri
     }
 
     private static Iterable<HttpRequestor.Header> anyHeaders() {
-        return Matchers.<Iterable<HttpRequestor.Header>>any();
+        return ArgumentMatchers.anyIterable();
     }
 
     private static byte [] serialize(Metadata metadata) {