Merge branch 'master' into TRUNK-6646

Author: jwnasambu

bom/pom.xml

@@ -56,7 +56,7 @@
 		<!-- infinispanVersion needs to be adjusted if hibernateVersion changes -->
 		<infinispanVersion>15.2.6.Final</infinispanVersion>
 		<aspectjVersion>1.9.25.1</aspectjVersion>
-		<jacksonVersion>2.21.3</jacksonVersion>
+		<jacksonVersion>2.21.4</jacksonVersion>
 		<slf4jVersion>1.7.36</slf4jVersion>
 		<log4jVersion>2.26.0</log4jVersion>
 		<jbossLoggingVersion>3.6.3.Final</jbossLoggingVersion>