Merge branch '2.0.x' into 2.1.x

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -113,7 +113,7 @@
 		<joda-time.version>2.10.1</joda-time.version>
 		<jolokia.version>1.6.0</jolokia.version>
 		<!-- Deprecated in favor of "johnzon.version" -->
-		<johnzon-jsonb.version>1.1.10</johnzon-jsonb.version>
+		<johnzon-jsonb.version>1.1.11</johnzon-jsonb.version>
 		<johnzon.version>${johnzon-jsonb.version}</johnzon.version>
 		<jooq.version>3.11.7</jooq.version>
 		<jsonassert.version>1.5.0</jsonassert.version>
@@ -200,7 +200,7 @@
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<git-commit-id-plugin.version>2.2.5</git-commit-id-plugin.version>
 		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-		<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
+		<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
 		<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
 		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
 		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>