Recurring merge from main (#1172)

No conflicts, no API change

data/avro-schema/build.gradle

@@ -11,6 +11,11 @@ plugins {
 
 dependencies {
  api "org.apache.avro:avro:$avroVersion"
+ constraints {
+ implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") {
+ because "required until new version of Avro available which updates Jackson"
+ }
+ }
 
  implementation platform(project(':corda-api'))
  implementation project(':base')

gradle.properties

@@ -3,7 +3,6 @@
 # their own projects. So don't get fancy with syntax!
 
 org.gradle.java.installations.auto-download=false
-org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
 # Versioning
 cordaProductVersion = 5.1.0-INTEROP
@@ -31,7 +30,7 @@ artifactoryContextUrl = https://software.r3.com/artifactory
 
 # Gradle
 # dokka need more metaspace - https://github.com/Kotlin/dokka/issues/1405
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=2g
 internalPublishVersion = 1.+
 dokkaVersion = 1.8.+
 detektPluginVersion = 1.22.+
@@ -49,7 +48,7 @@ bouncycastleVersion = 1.73
 grgitPluginVersion = 5.2.0
 taskTreePluginVersion = 2.1.1
 javaxPersistenceApiVersion = 2.2
-jacksonVersion = 2.15.0
+jacksonVersion = 2.15.2
 
 # Testing
 assertjVersion = 3.24.+