Merge branch '1.5.x'

Author: jonatan-ivanov

.circleci/config.yml

@@ -22,7 +22,7 @@ executors:
   circle-jdk11-executor:
     working_directory: ~/micrometer-tracing
     environment:
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1g -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
       - image: cimg/openjdk:11.0.28
   machine-executor: