Merge branch '2.0.x'

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

@@ -112,7 +112,9 @@
 		<jna.version>4.5.2</jna.version>
 		<joda-time.version>2.10</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.version>${johnzon-jsonb.version}</johnzon.version>
 		<jooq.version>3.11.5</jooq.version>
 		<jsonassert.version>1.5.0</jsonassert.version>
 		<json-path.version>2.4.0</json-path.version>
@@ -1515,10 +1517,40 @@
 				<artifactId>httpmime</artifactId>
 				<version>${httpclient.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.johnzon</groupId>
+				<artifactId>johnzon-core</artifactId>
+				<version>${johnzon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.johnzon</groupId>
+				<artifactId>johnzon-jaxrs</artifactId>
+				<version>${johnzon.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.johnzon</groupId>
 				<artifactId>johnzon-jsonb</artifactId>
-				<version>${johnzon-jsonb.version}</version>
+				<version>${johnzon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.johnzon</groupId>
+				<artifactId>johnzon-jsonb-extras</artifactId>
+				<version>${johnzon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.johnzon</groupId>
+				<artifactId>johnzon-jsonschema</artifactId>
+				<version>${johnzon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.johnzon</groupId>
+				<artifactId>johnzon-mapper</artifactId>
+				<version>${johnzon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.johnzon</groupId>
+				<artifactId>johnzon-websocket</artifactId>
+				<version>${johnzon.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.kafka</groupId>
@@ -2936,6 +2968,11 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.apache.johnzon</groupId>
+					<artifactId>johnzon-maven-plugin</artifactId>
+					<version>${johnzon.version}</version>
+				</plugin>
 				<plugin>
 					<groupId>org.jetbrains.kotlin</groupId>
 					<artifactId>kotlin-maven-plugin</artifactId>