Merge branch '1.1.x'

micrometer-metrics · Jun 8, 2023 · 01e6aa1 · 01e6aa1
2 parents f0ccce3 + 67ce2af
commit 01e6aa1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,29 +6,23 @@ executors:
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:19.0.1
-  circle-jdk8-executor:
-    working_directory: ~/micrometer-tracing
-    environment:
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
-    docker:
-      - image: cimg/openjdk:8.0.362
+      - image: cimg/openjdk:20.0.1
   circle-jdk11-executor:
     working_directory: ~/micrometer-tracing
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:11.0.18
+      - image: cimg/openjdk:11.0.19
   circle-jdk17-executor:
     working_directory: ~/micrometer-tracing
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:17.0.6
+      - image: cimg/openjdk:17.0.7
   machine-executor:
     working_directory: ~/micrometer-tracing
     machine:
-      image: ubuntu-2204:2023.02.1
+      image: ubuntu-2204:2023.04.2
 
 commands:
   gradlew-build:
@@ -40,12 +34,12 @@ commands:
     steps:
       - checkout
       - restore_cache:
-          key: gradle-dependencies-{{ checksum "build.gradle" }}
+          key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
       - run:
           name: downloadDependencies
           command: ./gradlew downloadDependencies --console=plain
       - save_cache:
-          key: gradle-dependencies-{{ checksum "build.gradle" }}
+          key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
           paths:
             - ~/.gradle
       - run:
@@ -68,11 +62,6 @@ jobs:
     steps:
       - gradlew-build
 
-  build-jdk8:
-    executor: circle-jdk8-executor
-    steps:
-      - gradlew-build
-
   build-jdk11:
     executor: circle-jdk11-executor
     steps:
@@ -94,7 +83,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: gradle-dependencies-{{ checksum "build.gradle" }}
+          key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
       - deploy:
           name: Deployment
           command: sh ./gradle/deploy.sh
@@ -104,14 +93,12 @@ workflows:
   build_prs_deploy_snapshots:
     jobs:
       - build
-      - build-jdk8
       - build-jdk11
       - build-jdk17
       - docker-tests
       - deploy:
           requires:
             - build
-            - build-jdk8
             - build-jdk11
             - build-jdk17
             - docker-tests
@@ -128,12 +115,6 @@ workflows:
               ignore: /.*/
             tags:
               only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
-      - build-jdk8:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - build-jdk11:
           filters:
             branches:
@@ -155,7 +136,6 @@ workflows:
       - deploy:
           requires:
             - build
-            - build-jdk8
             - build-jdk11
             - build-jdk17
             - docker-tests

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Git client to clone the source code to your local machine.
 
 ## Building
 
-Micrometer requires JDK 8 or later to build.
+Micrometer Tracing targets Java 8 but requires JDK 11 or later to build.
 
 The Gradle wrapper is provided and should be used for building with a consistent version of Gradle.