From 2ae29efc6533ab8898b6099cd29e2334a0715c24 Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 13:44:08 +0200
Subject: [PATCH 1/8] Bump versions.

---
 version.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.gradle.kts b/version.gradle.kts
index 073cc0e4..4d98db4c 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -25,6 +25,6 @@
  * `.config/gradle/dependencies.gradle`.
  */
 
-val spineBaseVersion: String by extra("1.6.13")
-val spineCoreVersion: String by extra("1.6.15")
-val versionToPublish: String by extra("1.6.15")
+val spineBaseVersion: String by extra("1.6.16")
+val spineCoreVersion: String by extra("1.6.18")
+val versionToPublish: String by extra("1.6.16")

From 91fa9fae2200eb47aaf59471057fee73af3cf0c8 Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 13:44:58 +0200
Subject: [PATCH 2/8] Update `config`.

---
 .idea/codeStyles/Project.xml                  |  26 +++-
 .idea/codeStyles/codeStyleConfig.xml          |   2 +-
 .idea/inspectionProfiles/Project_Default.xml  |  33 +----
 .../spine/gradle/internal/IncrementGuard.kt   |   6 +-
 .../io/spine/gradle/internal/RunBuild.kt      |  16 +--
 .../kotlin/io/spine/gradle/internal/deps.kt   | 121 +++++++++---------
 config                                        |   2 +-
 7 files changed, 107 insertions(+), 99 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d1143f76..5a399bd1 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -25,6 +25,27 @@
         <ANNO name="org.junit.jupiter.api.Test" />
       </REPEAT_ANNOTATIONS>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="false" />
+          <package name="io.ktor" alias="false" withSubpackages="false" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="false" />
+          <package name="javax" alias="false" withSubpackages="false" />
+          <package name="kotlin" alias="false" withSubpackages="false" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
@@ -71,5 +92,8 @@
         </groups>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123c..0f7bc519 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -2,4 +2,4 @@
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </state>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 03926c8c..44917ef5 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -74,7 +74,6 @@
     <inspection_tool class="BigDecimalEquals" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="BreakStatement" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="BreakStatementWithLabel" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="BusyWait" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CallToNativeMethodWhileLocked" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CallToStringConcatCanBeReplacedByOperator" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -215,7 +214,6 @@
       <option name="commentsAreContent" value="true" />
     </inspection_tool>
     <inspection_tool class="EmptyDirectory" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="EmptyInitializer" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="EmptySynchronizedStatement" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="WARNING" enabled_by_default="true">
       <scope name="Tests" level="TYPO" enabled="true">
@@ -252,7 +250,6 @@
       <option name="myCountEnumConstants" value="false" />
       <option name="m_limit" value="20" />
     </inspection_tool>
-    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="FinalizeNotProtected" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="FloatingPointEquality" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -327,11 +324,7 @@
       <option name="ignoreAbstractClasses" value="true" />
     </inspection_tool>
     <inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="InstantiationOfUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="IntLiteralMayBeLongLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="IntegerMultiplicationImplicitCastToLong" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreNonOverflowingCompileTimeConstants" value="true" />
-    </inspection_tool>
     <inspection_tool class="InterfaceNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_regex" value="[A-Z][A-Za-z\d]*" />
       <option name="m_minLength" value="3" />
@@ -340,7 +333,6 @@
     <inspection_tool class="InterfaceNeverImplemented" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreInterfacesThatOnlyDeclareConstants" value="true" />
     </inspection_tool>
-    <inspection_tool class="IteratorHasNextCallsIteratorNext" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="IteratorNextDoesNotThrowNoSuchElementException" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JDBCExecuteWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JDBCPrepareStatementWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -379,14 +371,13 @@
     </inspection_tool>
     <inspection_tool class="JavaLangImport" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JavaLangReflect" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="JavadocHtmlLint" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="JavadocHtmlLint" enabled="true" level="TYPO" enabled_by_default="true" />
     <inspection_tool class="JavadocReference" enabled="true" level="ERROR" enabled_by_default="true">
       <scope name="Tests" level="ERROR" enabled="false" />
     </inspection_tool>
     <inspection_tool class="LabeledStatement" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LengthOneStringsInConcatenation" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ListIndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ListenerMayUseAdapter" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="checkForEmptyMethods" value="true" />
     </inspection_tool>
@@ -474,6 +465,7 @@
       <option name="ignoreForLoopDeclarations" value="true" />
     </inspection_tool>
     <inspection_tool class="MultipleTopLevelClassesInFile" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MultipleVariablesInDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="NakedNotify" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="NativeMethods" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="NestedAssignment" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -494,6 +486,7 @@
         <extension name="JUnit4MethodNamingConvention" enabled="true">
           <option name="m_regex" value="[a-z][A-Za-z\d]*" />
           <option name="m_minLength" value="2" />
+          <option name="m_maxLength" value="64" />
         </extension>
       </scope>
       <scope name="Production" level="WARNING" enabled="true">
@@ -592,7 +585,6 @@
     <inspection_tool class="OverriddenMethodCallDuringObjectConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PackageDotHtmlMayBePackageInfo" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PackageInMultipleModules" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PackageInfoWithoutPackage" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PackageNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_regex" value="[a-z]+\d*[a-z]*" />
       <option name="m_minLength" value="2" />
@@ -643,7 +635,6 @@
       <option name="ignoreCloneable" value="false" />
     </inspection_tool>
     <inspection_tool class="RedundantMethodOverride" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantSuppression" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ResultOfObjectAllocationIgnored" enabled="true" level="WARNING" enabled_by_default="true">
       <scope name="Tests" level="WARNING" enabled="false" />
     </inspection_tool>
@@ -713,9 +704,6 @@
     <inspection_tool class="SubtractionInCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SuspiciousIndentAfterControlStatement" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SwitchStatementWithTooFewBranches" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_limit" value="2" />
-    </inspection_tool>
     <inspection_tool class="SwitchStatementsWithoutDefault" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_ignoreFullyCoveredEnums" value="true" />
     </inspection_tool>
@@ -732,16 +720,13 @@
     <inspection_tool class="SystemSetSecurityManager" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TailRecursion" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TestOnlyProblems" enabled="true" level="TYPO" enabled_by_default="true" />
-    <inspection_tool class="TextLabelInSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThisEscapedInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadDeathRethrown" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadDumpStack" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadLocalNotStaticFinal" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadPriority" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ThreadRun" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadStartInConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadStopSuspendResume" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ThreadWithDefaultRunMethod" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadYield" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreeNegationsPerMethod" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_ignoreInEquals" value="true" />
@@ -811,21 +796,13 @@
     <inspection_tool class="UnnecessaryJavaDocLink" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreInlineLinkToSuper" value="false" />
     </inspection_tool>
-    <inspection_tool class="UnnecessaryLocalVariable" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_ignoreImmediatelyReturnedVariables" value="true" />
+    <inspection_tool class="UnnecessaryLocalVariable" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreImmediatelyReturnedVariables" value="false" />
       <option name="m_ignoreAnnotatedVariables" value="false" />
     </inspection_tool>
     <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessarySuperQualifier" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryUnaryMinus" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnpredictableBigDecimalConstructorCall" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreReferences" value="true" />
-      <option name="ignoreComplexLiterals" value="false" />
-    </inspection_tool>
-    <inspection_tool class="UnqualifiedInnerClassAccess" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="ignoreReferencesToLocalInnerClasses" value="true" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnsecureRandomNumberGeneration" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnstableApiUsage" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <scope name="Tests" level="WEAK WARNING" enabled="false" />
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt
index 72eb0322..406f71fd 100644
--- a/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt
+++ b/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt
@@ -51,8 +51,10 @@ class IncrementGuard : Plugin<Project> {
 
             shouldRunAfter("test")
             if (!shouldCheckVersion()) {
-                logger.info("The build does not represent a GitHub Actions feature branch job, " +
-                        "the `checkVersionIncrement` task is disabled.")
+                logger.info(
+                    "The build does not represent a GitHub Actions feature branch job, " +
+                            "the `checkVersionIncrement` task is disabled."
+                )
                 this.enabled = false
             }
         }
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt
index 48dd298e..62c3a77a 100644
--- a/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt
+++ b/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt
@@ -70,8 +70,8 @@ open class RunBuild : DefaultTask() {
         val command = mutableListOf<String>()
         command.add("${project.rootDir}/$script")
         val shouldClean = project.gradle
-                                 .taskGraph
-                                 .hasTask(":clean")
+            .taskGraph
+            .hasTask(":clean")
         if (shouldClean) {
             command.add("clean")
         }
@@ -83,10 +83,10 @@ open class RunBuild : DefaultTask() {
     }
 
     private fun buildProcess(command: List<String>, errorOut: File, debugOut: File) =
-            ProcessBuilder()
-                    .command(command)
-                    .directory(project.file(directory))
-                    .redirectError(errorOut)
-                    .redirectOutput(debugOut)
-                    .start()
+        ProcessBuilder()
+            .command(command)
+            .directory(project.file(directory))
+            .redirectError(errorOut)
+            .redirectOutput(debugOut)
+            .start()
 }
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
index be5d1d09..9cbdc172 100644
--- a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
+++ b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
@@ -32,9 +32,11 @@ import java.net.URI
  *  https://github.com/uber/NullAway/blob/master/gradle/dependencies.gradle
  */
 
-data class Repository(val releases: String,
-                      val snapshots: String,
-                      val credentials: String)
+data class Repository(
+    val releases: String,
+    val snapshots: String,
+    val credentials: String
+)
 
 /**
  * Repositories to which we may publish. Normally, only one repository will be used.
@@ -43,14 +45,14 @@ data class Repository(val releases: String,
  */
 object PublishingRepos {
     val mavenTeamDev = Repository(
-            releases = "http://maven.teamdev.com/repository/spine",
-            snapshots = "http://maven.teamdev.com/repository/spine-snapshots",
-            credentials = "credentials.properties"
+        releases = "http://maven.teamdev.com/repository/spine",
+        snapshots = "http://maven.teamdev.com/repository/spine-snapshots",
+        credentials = "credentials.properties"
     )
     val cloudRepo = Repository(
-            releases = "https://spine.mycloudrepo.io/public/repositories/releases",
-            snapshots = "https://spine.mycloudrepo.io/public/repositories/snapshots",
-            credentials = "cloudrepo.properties"
+        releases = "https://spine.mycloudrepo.io/public/repositories/releases",
+        snapshots = "https://spine.mycloudrepo.io/public/repositories/snapshots",
+        credentials = "cloudrepo.properties"
     )
 }
 
@@ -126,25 +128,25 @@ object GradlePlugins {
 object Build {
     val errorProneJavac        = "com.google.errorprone:javac:${Versions.errorProneJavac}"
     val errorProneAnnotations = listOf(
-            "com.google.errorprone:error_prone_annotations:${Versions.errorProne}",
-            "com.google.errorprone:error_prone_type_annotations:${Versions.errorProne}"
+        "com.google.errorprone:error_prone_annotations:${Versions.errorProne}",
+        "com.google.errorprone:error_prone_type_annotations:${Versions.errorProne}"
     )
     val errorProneCheckApi     = "com.google.errorprone:error_prone_check_api:${Versions.errorProne}"
     val errorProneCore         = "com.google.errorprone:error_prone_core:${Versions.errorProne}"
     val errorProneTestHelpers  = "com.google.errorprone:error_prone_test_helpers:${Versions.errorProne}"
     val checkerAnnotations     = "org.checkerframework:checker-qual:${Versions.checkerFramework}"
     val checkerDataflow        = listOf(
-            "org.checkerframework:dataflow:${Versions.checkerFramework}",
-            "org.checkerframework:javacutil:${Versions.checkerFramework}"
+        "org.checkerframework:dataflow:${Versions.checkerFramework}",
+        "org.checkerframework:javacutil:${Versions.checkerFramework}"
     )
     val autoCommon             = "com.google.auto:auto-common:${Versions.autoCommon}"
     val autoService            = AutoService
     val jsr305Annotations      = "com.google.code.findbugs:jsr305:${Versions.findBugs}"
     val guava                  = "com.google.guava:guava:${Versions.guava}"
     val flogger                = "com.google.flogger:flogger:${Versions.flogger}"
-    val protobuf = listOf(
-            "com.google.protobuf:protobuf-java:${Versions.protobuf}",
-            "com.google.protobuf:protobuf-java-util:${Versions.protobuf}"
+    val protobuf               = listOf(
+        "com.google.protobuf:protobuf-java:${Versions.protobuf}",
+        "com.google.protobuf:protobuf-java-util:${Versions.protobuf}"
     )
     val protoc                 = "com.google.protobuf:protoc:${Versions.protobuf}"
     val googleHttpClient       = "com.google.http-client:google-http-client:${Versions.httpClient}"
@@ -224,20 +226,20 @@ object Runtime {
 
 object Test {
     val junit4        = "junit:junit:${Versions.junit4}"
-    val junit5Api = listOf(
-            "org.junit.jupiter:junit-jupiter-api:${Versions.junit5}",
-            "org.junit.jupiter:junit-jupiter-params:${Versions.junit5}",
-            "org.apiguardian:apiguardian-api:${Versions.apiguardian}"
+    val junit5Api     = listOf(
+        "org.junit.jupiter:junit-jupiter-api:${Versions.junit5}",
+        "org.junit.jupiter:junit-jupiter-params:${Versions.junit5}",
+        "org.apiguardian:apiguardian-api:${Versions.apiguardian}"
     )
     val junit5Runner  = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit5}"
     val junitPioneer  = "org.junit-pioneer:junit-pioneer:${Versions.junitPioneer}"
     val guavaTestlib  = "com.google.guava:guava-testlib:${Versions.guava}"
     val mockito       = "org.mockito:mockito-core:2.12.0"
     val hamcrest      = "org.hamcrest:hamcrest-all:1.3"
-    val truth = listOf(
-            "com.google.truth:truth:${Versions.truth}",
-            "com.google.truth.extensions:truth-java8-extension:${Versions.truth}",
-            "com.google.truth.extensions:truth-proto-extension:${Versions.truth}"
+    val truth         = listOf(
+        "com.google.truth:truth:${Versions.truth}",
+        "com.google.truth.extensions:truth-java8-extension:${Versions.truth}",
+        "com.google.truth.extensions:truth-proto-extension:${Versions.truth}"
     )
     @Deprecated("Use Flogger over SLF4J.",
             replaceWith = ReplaceWith("Deps.runtime.floggerSystemBackend"))
@@ -298,36 +300,36 @@ object DependencyResolution {
                 cacheChangingModulesFor(0, "seconds")
                 @Suppress("DEPRECATION") // Force SLF4J version.
                 force(
-                        Deps.build.slf4j,
-                        Deps.build.errorProneAnnotations,
-                        Deps.build.jsr305Annotations,
-                        Deps.build.checkerAnnotations,
-                        Deps.build.autoCommon,
-                        Deps.build.guava,
-                        Deps.build.animalSniffer,
-                        Deps.build.protobuf,
-                        Deps.test.guavaTestlib,
-                        Deps.test.truth,
-                        Deps.test.junit5Api,
-                        Deps.test.junit4,
-
-                        // Transitive dependencies of 3rd party components that we don't use directly.
-                        "org.junit.platform:junit-platform-commons:${Versions.junitPlatform}",
-                        "com.google.auto.value:auto-value-annotations:1.7.4",
-                        "com.google.auto.service:auto-service-annotations:1.0-rc7",
-                        "com.google.code.gson:gson:2.8.6",
-                        "com.google.j2objc:j2objc-annotations:1.3",
-                        "org.codehaus.plexus:plexus-utils:3.3.0",
-                        "com.squareup.okio:okio:1.17.5", // Last version before next major.
-                        "commons-cli:commons-cli:1.4",
-
-                        // Force discontinued transitive dependency until everybody migrates off it.
-                        "org.checkerframework:checker-compat-qual:2.5.5",
-
-                        "commons-logging:commons-logging:1.2",
-
-                        // Force the Gradle Protobuf plugin version.
-                        Deps.build.gradlePlugins.protobuf
+                    Deps.build.slf4j,
+                    Deps.build.errorProneAnnotations,
+                    Deps.build.jsr305Annotations,
+                    Deps.build.checkerAnnotations,
+                    Deps.build.autoCommon,
+                    Deps.build.guava,
+                    Deps.build.animalSniffer,
+                    Deps.build.protobuf,
+                    Deps.test.guavaTestlib,
+                    Deps.test.truth,
+                    Deps.test.junit5Api,
+                    Deps.test.junit4,
+
+                    // Transitive dependencies of 3rd party components that we don't use directly.
+                    "org.junit.platform:junit-platform-commons:${Versions.junitPlatform}",
+                    "com.google.auto.value:auto-value-annotations:1.7.4",
+                    "com.google.auto.service:auto-service-annotations:1.0-rc7",
+                    "com.google.code.gson:gson:2.8.6",
+                    "com.google.j2objc:j2objc-annotations:1.3",
+                    "org.codehaus.plexus:plexus-utils:3.3.0",
+                    "com.squareup.okio:okio:1.17.5", // Last version before next major.
+                    "commons-cli:commons-cli:1.4",
+
+                    // Force discontinued transitive dependency until everybody migrates off it.
+                    "org.checkerframework:checker-compat-qual:2.5.5",
+
+                    "commons-logging:commons-logging:1.2",
+
+                    // Force the Gradle Protobuf plugin version.
+                    Deps.build.gradlePlugins.protobuf
                 )
             }
         }
@@ -338,10 +340,13 @@ object DependencyResolution {
         excludeProtoLite(configurations, "testRuntime")
     }
 
-    private fun excludeProtoLite(configurations: ConfigurationContainer,
-                                 configurationName: String) {
-        configurations.named(configurationName).get()
-                .exclude(mapOf("group" to "com.google.protobuf", "module" to "protobuf-lite"))
+    private fun excludeProtoLite(
+        configurations: ConfigurationContainer,
+        configurationName: String
+    ) {
+        configurations
+            .named(configurationName).get()
+            .exclude(mapOf("group" to "com.google.protobuf", "module" to "protobuf-lite"))
     }
 
     fun defaultRepositories(repositories: RepositoryHandler) {
diff --git a/config b/config
index cfb3f751..767dfbc0 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit cfb3f751f231403387899aef0887d967dd36a805
+Subproject commit 767dfbc093bb99c44e631034b1c69cbc58bc3536

From 50ffd939776bff9ae72b9b46a4d19691784af6ba Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 14:11:15 +0200
Subject: [PATCH 3/8] Update GCP dependencies

---
 datastore/build.gradle.kts | 2 +-
 pubsub/build.gradle.kts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/datastore/build.gradle.kts b/datastore/build.gradle.kts
index f846284d..069eb5c4 100644
--- a/datastore/build.gradle.kts
+++ b/datastore/build.gradle.kts
@@ -31,7 +31,7 @@ val spineCoreVersion: String by extra
 
 dependencies {
     // Google Cloud Datastore
-    api("com.google.cloud:google-cloud-datastore:1.105.1") {
+    api("com.google.cloud:google-cloud-datastore:1.105.2") {
         exclude(group = "com.google.protobuf")
         exclude(group = "com.google.guava")
     }
diff --git a/pubsub/build.gradle.kts b/pubsub/build.gradle.kts
index 052390d4..2288441c 100644
--- a/pubsub/build.gradle.kts
+++ b/pubsub/build.gradle.kts
@@ -20,5 +20,5 @@
 
 dependencies {
     // Google Cloud Pubsub protos
-    api("com.google.api.grpc:proto-google-cloud-pubsub-v1:1.91.0")
+    api("com.google.api.grpc:proto-google-cloud-pubsub-v1:1.92.0")
 }

From 704d4bb2b7a32cd5b55d548506695b1fb53966a1 Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 14:11:41 +0200
Subject: [PATCH 4/8] Migrate to the new Gradle dependency `compileOnlyApi`
 configuration.

---
 build.gradle.kts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fd89a2a5..005ea270 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,7 +45,7 @@ buildscript {
 }
 
 plugins {
-    java
+    `java-library`
     idea
     jacoco
     @Suppress("RemoveRedundantQualifierName") // Cannot use imports here.
@@ -122,20 +122,24 @@ subprojects {
     dependencies {
         errorprone(Deps.build.errorProneCore)
         errorproneJavac(Deps.build.errorProneJavac)
-        // For dependencies config. based on version of Java, see:
-        //  https://github.com/epeee/junit-jupiter-extension-testing/blob/57b7ba75ab64ed8c229d2a5b14a954d6ae359189/gradle/errorprone.gradle
 
         implementation("io.spine:spine-server:$spineCoreVersion")
 
+        compileOnlyApi(Deps.build.checkerAnnotations)
+        compileOnlyApi(Deps.build.jsr305Annotations)
+        Deps.build.errorProneAnnotations.forEach { compileOnlyApi(it) }
+
         testImplementation("io.spine:spine-testutil-server:$spineCoreVersion")
         testImplementation(group = "io.spine",
                            name = "spine-server",
                            version = spineCoreVersion,
                            classifier = "test")
-        Deps.test.junit5Api.forEach { testImplementation(it) }
-        testImplementation(Deps.test.junit5Runner)
         testImplementation(Deps.test.hamcrest)
         testImplementation(Deps.test.guavaTestlib)
+        testImplementation(Deps.test.junitPioneer)
+        Deps.test.junit5Api.forEach { testImplementation(it) }
+        Deps.test.truth.forEach { testImplementation(it) }
+        testRuntimeOnly(Deps.test.junit5Runner)
     }
 
     // Apply the same IDEA module configuration for each of sub-projects.

From 1c9fd84dbfecbc82a9a6966070b54dbeb3bd4be8 Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 14:38:32 +0200
Subject: [PATCH 5/8] Migrate from `hamcrest` and drop unused dependencies.

---
 build.gradle.kts                              |  3 -
 .../NewBoundedContextBuilderTest.java         | 14 ++---
 .../SingleTenantNamespaceSupplierTest.java    | 62 ++++++-------------
 3 files changed, 26 insertions(+), 53 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 005ea270..2275fe51 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -134,9 +134,6 @@ subprojects {
                            name = "spine-server",
                            version = spineCoreVersion,
                            classifier = "test")
-        testImplementation(Deps.test.hamcrest)
-        testImplementation(Deps.test.guavaTestlib)
-        testImplementation(Deps.test.junitPioneer)
         Deps.test.junit5Api.forEach { testImplementation(it) }
         Deps.test.truth.forEach { testImplementation(it) }
         testRuntimeOnly(Deps.test.junit5Runner)
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java
index 245664e9..8b9f8945 100644
--- a/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java
+++ b/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java
@@ -21,6 +21,7 @@
 package io.spine.server.storage.datastore;
 
 import com.google.cloud.datastore.Datastore;
+import com.google.common.truth.Truth;
 import io.spine.server.BoundedContext;
 import io.spine.server.BoundedContextBuilder;
 import io.spine.server.storage.datastore.tenant.TestNamespaceIndex;
@@ -31,10 +32,7 @@
 
 import java.util.Optional;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static com.google.common.truth.Truth8.assertThat;
 
 @DisplayName("DatastoreStorageFactory should")
 class NewBoundedContextBuilderTest {
@@ -45,14 +43,14 @@ void testProduceBCBuilder() {
         DatastoreStorageFactory factory = givenFactory();
         BoundedContextBuilder builder = BoundedContext.multitenant(
                 NewBoundedContextBuilderTest.class.getName());
-        assertFalse(builder.tenantIndex()
-                           .isPresent());
+        assertThat(builder.tenantIndex()).isEmpty();
 
         Optional<? extends TenantIndex> updatedIndex =
                 factory.configureTenantIndex(builder)
                        .tenantIndex();
-        assertTrue(updatedIndex.isPresent());
-        assertThat(updatedIndex.get(), instanceOf(TestNamespaceIndex.getType()));
+        assertThat(updatedIndex).isPresent();
+        Truth.assertThat(updatedIndex.get())
+             .isInstanceOf(TestNamespaceIndex.getType());
     }
 
     private static DatastoreStorageFactory givenFactory() {
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
index 4489be2a..99e9a367 100644
--- a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
+++ b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
@@ -23,17 +23,11 @@
 import io.spine.core.TenantId;
 import io.spine.net.EmailAddress;
 import io.spine.net.InternetDomain;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import static com.google.common.truth.Truth.assertThat;
 import static io.spine.protobuf.Messages.isDefault;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @DisplayName("`SingleTenantNamespaceSupplier` should")
@@ -45,9 +39,9 @@ void testProduceEmpty() {
         NamespaceSupplier supplier = NamespaceSupplier.singleTenant();
         Namespace namespace = supplier.get();
         assertNotNull(namespace);
-        assertThat(namespace.value(), isEmptyString());
-        TenantId tenantId = namespace.toTenantId();
-        assertThat(tenantId, isEffectivelyDefault());
+        assertThat(namespace.value()).isEmpty();
+        TenantId tenant = namespace.toTenantId();
+        assertThat(isEffectivelyDefault(tenant)).isTrue();
     }
 
     @Test
@@ -56,40 +50,24 @@ void testProduceCustom() {
         String namespaceValue = "my-custom-namespace";
         NamespaceSupplier supplier = NamespaceSupplier.singleTenant(namespaceValue);
         Namespace namespace = supplier.get();
-        assertNotNull(namespace);
-        assertEquals(namespaceValue, namespace.value());
+        assertThat(namespace).isNotNull();
+        assertThat(namespace.value()).isEqualTo(namespaceValue);
 
-        TenantId tenantId = namespace.toTenantId();
-        assertThat(tenantId, not(isEffectivelyDefault()));
-        String actualNamespaceValue = tenantId.getValue();
-        assertEquals(namespaceValue, actualNamespaceValue);
+        TenantId tenant = namespace.toTenantId();
+        assertThat(isEffectivelyDefault(tenant)).isFalse();
+        assertThat(tenant.getValue()).isEqualTo(namespaceValue);
     }
 
-    @SuppressWarnings("OverlyComplexAnonymousInnerClass") // OK for the test purposes
-    private static Matcher<TenantId> isEffectivelyDefault() {
-        return new BaseMatcher<TenantId>() {
-            @Override
-            public boolean matches(Object item) {
-                if (!(item instanceof TenantId)) {
-                    return false;
-                }
-                TenantId tenantId = (TenantId) item;
-                InternetDomain domain = tenantId.getDomain();
-                if (!isDefault(domain)) {
-                    return false;
-                }
-                EmailAddress email = tenantId.getEmail();
-                if (!isDefault(email)) {
-                    return false;
-                }
-                String value = tenantId.getValue();
-                return value.isEmpty();
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("not default, as expected");
-            }
-        };
+    private static boolean isEffectivelyDefault(TenantId tenant) {
+        InternetDomain domain = tenant.getDomain();
+        if (!isDefault(domain)) {
+            return false;
+        }
+        EmailAddress email = tenant.getEmail();
+        if (!isDefault(email)) {
+            return false;
+        }
+        String value = tenant.getValue();
+        return value.isEmpty();
     }
 }

From b0fdbe3b53b2c2abfa80438f48881d8b52cdc539 Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 15:13:31 +0200
Subject: [PATCH 6/8] Update reports.

---
 license-report.md | 76 ++++++++++++++++-------------------------------
 pom.xml           | 36 ++++++++++++----------
 2 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/license-report.md b/license-report.md
index 8471636a..0b117ab0 100644
--- a/license-report.md
+++ b/license-report.md
@@ -1,6 +1,6 @@
 
     
-# Dependencies of `io.spine.gcloud:spine-datastore:1.6.12`
+# Dependencies of `io.spine.gcloud:spine-datastore:1.6.16`
 
 ## Runtime
 1. **Group:** com.fasterxml.jackson.core **Name:** jackson-core **Version:** 2.11.3
@@ -28,7 +28,7 @@
      * **Manifest Project URL:** [https://developers.google.com/api-client-library/java/](https://developers.google.com/api-client-library/java/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.1
+1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1](https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -58,7 +58,7 @@
      * **POM Project URL:** [https://github.com/googleapis/java-core](https://github.com/googleapis/java-core)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.1
+1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore](https://github.com/googleapis/java-datastore)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -75,9 +75,6 @@
 1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
      * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
-     * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
 1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
      * **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
      * **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -114,7 +111,7 @@
      * **POM Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.1
+1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.2
      * **Manifest Project URL:** [https://www.google.com/](https://www.google.com/)
      * **POM License: The Apache Software License, Version 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -188,7 +185,7 @@
      * **POM License: GNU General Public License, version 2 (GPL2), with the classpath exception** - [http://www.gnu.org/software/classpath/license.html](http://www.gnu.org/software/classpath/license.html)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
 
-1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.7.1
+1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.5.0
      * **Manifest License:** MIT (Not packaged)
      * **POM Project URL:** [https://checkerframework.org](https://checkerframework.org)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
@@ -240,7 +237,7 @@
      * **Manifest Project URL:** [https://developers.google.com/api-client-library/java/](https://developers.google.com/api-client-library/java/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.1
+1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1](https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -281,7 +278,7 @@
      * **POM Project URL:** [https://github.com/googleapis/java-core](https://github.com/googleapis/java-core)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.1
+1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore](https://github.com/googleapis/java-datastore)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -360,7 +357,7 @@
      * **POM Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.1
+1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.2
      * **Manifest Project URL:** [https://www.google.com/](https://www.google.com/)
      * **POM License: The Apache Software License, Version 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -523,9 +520,6 @@
      * **POM License: MIT license** - [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** org.hamcrest **Name:** hamcrest-all **Version:** 1.3
-     * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
-
 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3
      * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
 
@@ -588,12 +582,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri Dec 04 14:39:18 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
     
-# Dependencies of `io.spine.gcloud:spine-pubsub:1.6.12`
+# Dependencies of `io.spine.gcloud:spine-pubsub:1.6.16`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -604,7 +598,7 @@ This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://github.com/googleapis/api-common-java](https://github.com/googleapis/api-common-java)
      * **POM License: BSD** - [https://github.com/googleapis/api-common-java/blob/master/LICENSE](https://github.com/googleapis/api-common-java/blob/master/LICENSE)
 
-1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-pubsub-v1 **Version:** 1.91.0
+1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-pubsub-v1 **Version:** 1.92.0
      * **POM Project URL:** [https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1](https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -626,9 +620,6 @@ This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-Lice
 1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
      * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
-     * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
 1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
      * **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
      * **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -698,7 +689,7 @@ This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-Lice
      * **POM License: GNU General Public License, version 2 (GPL2), with the classpath exception** - [http://www.gnu.org/software/classpath/license.html](http://www.gnu.org/software/classpath/license.html)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
 
-1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.7.1
+1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.5.0
      * **Manifest License:** MIT (Not packaged)
      * **POM Project URL:** [https://checkerframework.org](https://checkerframework.org)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
@@ -728,7 +719,7 @@ This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://github.com/googleapis/api-common-java](https://github.com/googleapis/api-common-java)
      * **POM License: BSD** - [https://github.com/googleapis/api-common-java/blob/master/LICENSE](https://github.com/googleapis/api-common-java/blob/master/LICENSE)
 
-1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-pubsub-v1 **Version:** 1.91.0
+1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-pubsub-v1 **Version:** 1.92.0
      * **POM Project URL:** [https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1](https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -945,9 +936,6 @@ This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-Lice
      * **POM License: MIT license** - [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** org.hamcrest **Name:** hamcrest-all **Version:** 1.3
-     * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
-
 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3
      * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
 
@@ -1005,12 +993,12 @@ This report was generated on **Mon Nov 23 15:05:20 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Nov 23 15:05:25 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri Dec 04 14:39:26 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
     
-# Dependencies of `io.spine.gcloud:spine-stackdriver-trace:1.6.12`
+# Dependencies of `io.spine.gcloud:spine-stackdriver-trace:1.6.16`
 
 ## Runtime
 1. **Group:** com.fasterxml.jackson.core **Name:** jackson-core **Version:** 2.11.3
@@ -1070,9 +1058,6 @@ This report was generated on **Mon Nov 23 15:05:25 EET 2020** using [Gradle-Lice
 1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
      * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
-     * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
 1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
      * **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
      * **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -1193,7 +1178,7 @@ This report was generated on **Mon Nov 23 15:05:25 EET 2020** using [Gradle-Lice
      * **POM License: GNU General Public License, version 2 (GPL2), with the classpath exception** - [http://www.gnu.org/software/classpath/license.html](http://www.gnu.org/software/classpath/license.html)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
 
-1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.7.1
+1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.5.0
      * **Manifest License:** MIT (Not packaged)
      * **POM Project URL:** [https://checkerframework.org](https://checkerframework.org)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
@@ -1531,9 +1516,6 @@ This report was generated on **Mon Nov 23 15:05:25 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://conscrypt.org/](https://conscrypt.org/)
      * **POM License: Apache 2** - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
-1. **Group:** org.hamcrest **Name:** hamcrest-all **Version:** 1.3
-     * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
-
 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3
      * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
 
@@ -1596,12 +1578,12 @@ This report was generated on **Mon Nov 23 15:05:25 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri Dec 04 14:39:37 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
     
-# Dependencies of `io.spine.gcloud:spine-testutil-gcloud:1.6.12`
+# Dependencies of `io.spine.gcloud:spine-testutil-gcloud:1.6.16`
 
 ## Runtime
 1. **Group:** com.fasterxml.jackson.core **Name:** jackson-core **Version:** 2.11.3
@@ -1629,7 +1611,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/api-client-library/java/](https://developers.google.com/api-client-library/java/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.1
+1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1](https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1659,7 +1641,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://github.com/googleapis/java-core](https://github.com/googleapis/java-core)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.1
+1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore](https://github.com/googleapis/java-datastore)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1676,9 +1658,6 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
 1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
      * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
-     * **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
 1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
      * **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
      * **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -1715,7 +1694,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.1
+1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.2
      * **Manifest Project URL:** [https://www.google.com/](https://www.google.com/)
      * **POM License: The Apache Software License, Version 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1789,7 +1768,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **POM License: GNU General Public License, version 2 (GPL2), with the classpath exception** - [http://www.gnu.org/software/classpath/license.html](http://www.gnu.org/software/classpath/license.html)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
 
-1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.7.1
+1. **Group:** org.checkerframework **Name:** checker-qual **Version:** 3.5.0
      * **Manifest License:** MIT (Not packaged)
      * **POM Project URL:** [https://checkerframework.org](https://checkerframework.org)
      * **POM License: The MIT License** - [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)
@@ -1841,7 +1820,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/api-client-library/java/](https://developers.google.com/api-client-library/java/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.1
+1. **Group:** com.google.api.grpc **Name:** proto-google-cloud-datastore-v1 **Version:** 0.88.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1](https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1882,7 +1861,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://github.com/googleapis/java-core](https://github.com/googleapis/java-core)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.1
+1. **Group:** com.google.cloud **Name:** google-cloud-datastore **Version:** 1.105.2
      * **POM Project URL:** [https://github.com/googleapis/java-datastore](https://github.com/googleapis/java-datastore)
      * **POM License: Apache-2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1961,7 +1940,7 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **POM Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.1
+1. **Group:** com.google.oauth-client **Name:** google-oauth-client **Version:** 1.31.2
      * **Manifest Project URL:** [https://www.google.com/](https://www.google.com/)
      * **POM License: The Apache Software License, Version 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -2124,9 +2103,6 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
      * **POM License: MIT license** - [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1. **Group:** org.hamcrest **Name:** hamcrest-all **Version:** 1.3
-     * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
-
 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3
      * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php)
 
@@ -2189,4 +2165,4 @@ This report was generated on **Mon Nov 23 15:05:32 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Nov 23 15:05:35 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
+This report was generated on **Fri Dec 04 14:39:42 EET 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 66d4de0b..8d83fa3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.
 
 <groupId>io.spine.gcloud</groupId>
 <artifactId>spine-gcloud-java</artifactId>
-<version>1.6.12</version>
+<version>1.6.16</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -28,13 +28,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>proto-google-cloud-pubsub-v1</artifactId>
-    <version>1.91.0</version>
+    <version>1.92.0</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore</artifactId>
-    <version>1.105.1</version>
+    <version>1.105.2</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -46,19 +46,31 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-server</artifactId>
-    <version>1.6.13</version>
+    <version>1.6.18</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
-    <groupId>com.google.guava</groupId>
-    <artifactId>guava-testlib</artifactId>
-    <version>30.0-jre</version>
+    <groupId>com.google.truth</groupId>
+    <artifactId>truth</artifactId>
+    <version>1.1</version>
+    <scope>test</scope>
+  </dependency>
+  <dependency>
+    <groupId>com.google.truth.extensions</groupId>
+    <artifactId>truth-java8-extension</artifactId>
+    <version>1.1</version>
+    <scope>test</scope>
+  </dependency>
+  <dependency>
+    <groupId>com.google.truth.extensions</groupId>
+    <artifactId>truth-proto-extension</artifactId>
+    <version>1.1</version>
     <scope>test</scope>
   </dependency>
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-testutil-server</artifactId>
-    <version>1.6.13</version>
+    <version>1.6.18</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -67,12 +79,6 @@ all modules and does not describe the project structure per-subproject.
     <version>1.1.0</version>
     <scope>test</scope>
   </dependency>
-  <dependency>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-all</artifactId>
-    <version>1.3</version>
-    <scope>test</scope>
-  </dependency>
   <dependency>
     <groupId>org.junit.jupiter</groupId>
     <artifactId>junit-jupiter-api</artifactId>
@@ -114,7 +120,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-protoc-plugin</artifactId>
-    <version>1.6.12</version>
+    <version>1.6.16</version>
   </dependency>
   <dependency>
     <groupId>net.sourceforge.pmd</groupId>

From 6583d86641f5b24e3d134e059b0f5136dc219678 Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Fri, 4 Dec 2020 15:13:58 +0200
Subject: [PATCH 7/8] Add `misc.xml` from the `config` module.

---
 .idea/misc.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .idea/misc.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..e881be66
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
+    <option name="myNullables">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="javax.validation.constraints.NotNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>

From ea1bff5a0518b44beeca1699b99b20321449456a Mon Sep 17 00:00:00 2001
From: Yuri Sergiichuk <yuri.sergiichuk@teamdev.com>
Date: Mon, 7 Dec 2020 12:31:53 +0200
Subject: [PATCH 8/8] Improve formatting.

---
 .../NewBoundedContextBuilderTest.java         | 15 ++++++++-----
 .../SingleTenantNamespaceSupplierTest.java    | 22 ++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java
index 8b9f8945..bb851e80 100644
--- a/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java
+++ b/datastore/src/test/java/io/spine/server/storage/datastore/NewBoundedContextBuilderTest.java
@@ -21,7 +21,6 @@
 package io.spine.server.storage.datastore;
 
 import com.google.cloud.datastore.Datastore;
-import com.google.common.truth.Truth;
 import io.spine.server.BoundedContext;
 import io.spine.server.BoundedContextBuilder;
 import io.spine.server.storage.datastore.tenant.TestNamespaceIndex;
@@ -32,6 +31,7 @@
 
 import java.util.Optional;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
 
 @DisplayName("DatastoreStorageFactory should")
@@ -42,15 +42,18 @@ class NewBoundedContextBuilderTest {
     void testProduceBCBuilder() {
         DatastoreStorageFactory factory = givenFactory();
         BoundedContextBuilder builder = BoundedContext.multitenant(
-                NewBoundedContextBuilderTest.class.getName());
-        assertThat(builder.tenantIndex()).isEmpty();
+                NewBoundedContextBuilderTest.class.getName()
+        );
+        assertThat(builder.tenantIndex())
+                .isEmpty();
 
         Optional<? extends TenantIndex> updatedIndex =
                 factory.configureTenantIndex(builder)
                        .tenantIndex();
-        assertThat(updatedIndex).isPresent();
-        Truth.assertThat(updatedIndex.get())
-             .isInstanceOf(TestNamespaceIndex.getType());
+        assertThat(updatedIndex)
+                .isPresent();
+        assertThat(updatedIndex.get())
+                .isInstanceOf(TestNamespaceIndex.getType());
     }
 
     private static DatastoreStorageFactory givenFactory() {
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
index 99e9a367..eae6de51 100644
--- a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
+++ b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
@@ -28,7 +28,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static io.spine.protobuf.Messages.isDefault;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @DisplayName("`SingleTenantNamespaceSupplier` should")
 class SingleTenantNamespaceSupplierTest {
@@ -38,10 +37,13 @@ class SingleTenantNamespaceSupplierTest {
     void testProduceEmpty() {
         NamespaceSupplier supplier = NamespaceSupplier.singleTenant();
         Namespace namespace = supplier.get();
-        assertNotNull(namespace);
-        assertThat(namespace.value()).isEmpty();
+        assertThat(namespace)
+                .isNotNull();
+        assertThat(namespace.value())
+                .isEmpty();
         TenantId tenant = namespace.toTenantId();
-        assertThat(isEffectivelyDefault(tenant)).isTrue();
+        assertThat(isEffectivelyDefault(tenant))
+                .isTrue();
     }
 
     @Test
@@ -50,12 +52,16 @@ void testProduceCustom() {
         String namespaceValue = "my-custom-namespace";
         NamespaceSupplier supplier = NamespaceSupplier.singleTenant(namespaceValue);
         Namespace namespace = supplier.get();
-        assertThat(namespace).isNotNull();
-        assertThat(namespace.value()).isEqualTo(namespaceValue);
+        assertThat(namespace)
+                .isNotNull();
+        assertThat(namespace.value())
+                .isEqualTo(namespaceValue);
 
         TenantId tenant = namespace.toTenantId();
-        assertThat(isEffectivelyDefault(tenant)).isFalse();
-        assertThat(tenant.getValue()).isEqualTo(namespaceValue);
+        assertThat(isEffectivelyDefault(tenant))
+                .isFalse();
+        assertThat(tenant.getValue())
+                .isEqualTo(namespaceValue);
     }
 
     private static boolean isEffectivelyDefault(TenantId tenant) {