Merge branch 'master' into static_rocksdb_mac

Author: dmitry-timofeev

exonum-java-binding/core/src/test/java/com/exonum/binding/core/storage/indices/BaseListIndexProxyGroupTestable.java

@@ -42,11 +42,11 @@ void listsInGroupMustBeIndependent() {
 
     // Create a list proxy for each id
     Map<String, ListIndex<String>> listsById = new HashMap<>();
-    for (String setId : elementsById.keys()) {
-      byte[] id = bytes(setId);
-      ListIndex<String> set = createInGroup(id, view);
+    for (String listId : elementsById.keys()) {
+      byte[] id = bytes(listId);
+      ListIndex<String> list = createInGroup(id, view);
 
-      listsById.put(setId, set);
+      listsById.put(listId, list);
     }
 
     // Add elements to each list in the group

exonum-java-binding/pom.xml

@@ -115,7 +115,7 @@
     <junit.version>4.12</junit.version>
     <junit.jupiter.version>5.5.0</junit.jupiter.version>
     <powermock.version>2.0.2</powermock.version>
-    <protobuf.version>3.8.0</protobuf.version>
+    <protobuf.version>3.9.0</protobuf.version>
     <mockito-core.version>3.0.0</mockito-core.version>
     <guava.version>28.0-jre</guava.version>
     <vertx.version>3.7.1</vertx.version>
@@ -421,29 +421,7 @@
           <configuration>
             <source>${java.compiler.source}</source>
             <doclint>none</doclint>
-            <!-- Allow fetching links below -->
-            <isOffline>false</isOffline>
             <detectOfflineLinks>false</detectOfflineLinks>
-            <links>
-              <!-- Published Exonum API docs. Only the modules that are dependencies of
-                   other modules are listed here.
-
-                   To generate release Javadocs, a two-step process is required:
-                     0. Bump version.
-                     1. Generate Javadocs for the given version. They won't have cross-references,
-                        because no Javadocs have been published on the website.
-                     2. Upload them to the website.
-                     3. Re-generate Javadocs. This time the Javadocs will be available
-                        on the website, and cross-references will be added.
-                     4. Upload the new ones.
-
-                   Our web-site seems to be the only one compatible with javadoc tool —
-                   the Javadocs published on javadoc.io, github.io (guava and vertx)
-                   do not work.
-              -->
-              <link>https://exonum.com/doc/api/java-binding-common/${project.version}</link>
-              <link>https://exonum.com/doc/api/java-binding-core/${project.version}</link>
-            </links>
             <additionalJOption>${maven.javadoc.joption}</additionalJOption>
           </configuration>
           <executions>

exonum-light-client/pom.xml

@@ -256,6 +256,7 @@
           <!-- Allow fetching external resources to generate links -->
           <isOffline>false</isOffline>
           <links>
+            <!-- todo: Update when upgraded to 0.7 to new link: https://exonum.com/doc/api/java-binding/${ejb.version} -->
             <link>https://exonum.com/doc/api/java-binding-common/${ejb.version}</link>
           </links>
         </configuration>