From bd943dfb51e7e0ca9c4e3860880262711fa8eb76 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 8 Sep 2023 14:17:00 -0700 Subject: [PATCH 1/5] Upgrade foojay-resolver-convention to 0.7.0 Closes gh-4069 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index bdadb58001..e2c6ae164c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { plugins { id 'com.gradle.enterprise' version '3.14.1' id 'io.spring.ge.conventions' version '0.0.14' - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.6.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } rootProject.name = 'micrometer' From 617c7740671869ee76622f6eb1538eb487353d65 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 8 Sep 2023 14:19:46 -0700 Subject: [PATCH 2/5] Upgrade to AWS SDK 1.12.546 Closes gh-4070 --- .../micrometer-registry-cloudwatch/gradle.lockfile | 6 +++--- samples/micrometer-samples-boot2/gradle.lockfile | 6 +++--- samples/micrometer-samples-core/gradle.lockfile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/implementations/micrometer-registry-cloudwatch/gradle.lockfile b/implementations/micrometer-registry-cloudwatch/gradle.lockfile index 8b84a990c2..c2588bdf78 100644 --- a/implementations/micrometer-registry-cloudwatch/gradle.lockfile +++ b/implementations/micrometer-registry-cloudwatch/gradle.lockfile @@ -4,9 +4,9 @@ antlr:antlr:2.7.7=nohttp ch.qos.logback:logback-classic:1.2.3=checkstyle,nohttp,nohttp-cli ch.qos.logback:logback-core:1.2.3=checkstyle,nohttp,nohttp-cli -com.amazonaws:aws-java-sdk-cloudwatch:1.12.526=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.526=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.526=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-cloudwatch:1.12.546=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.546=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:jmespath-java:1.12.546=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.13.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/samples/micrometer-samples-boot2/gradle.lockfile b/samples/micrometer-samples-boot2/gradle.lockfile index af7ada06b8..edbe23b11e 100644 --- a/samples/micrometer-samples-boot2/gradle.lockfile +++ b/samples/micrometer-samples-boot2/gradle.lockfile @@ -4,9 +4,9 @@ antlr:antlr:2.7.7=nohttp ch.qos.logback:logback-classic:1.2.12=checkstyle,compileClasspath,nohttp,nohttp-cli,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.12=checkstyle,compileClasspath,nohttp,nohttp-cli,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-cloudwatch:1.12.526=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.526=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.526=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-cloudwatch:1.12.546=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.546=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:jmespath-java:1.12.546=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.dynatrace.metric.util:dynatrace-metric-utils-java:1.5.0=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/samples/micrometer-samples-core/gradle.lockfile b/samples/micrometer-samples-core/gradle.lockfile index 07af682f00..e622c56f33 100644 --- a/samples/micrometer-samples-core/gradle.lockfile +++ b/samples/micrometer-samples-core/gradle.lockfile @@ -7,9 +7,9 @@ ch.qos.logback:logback-classic:1.2.3=checkstyle,nohttp,nohttp-cli ch.qos.logback:logback-core:1.2.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=checkstyle,nohttp,nohttp-cli colt:colt:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-cloudwatch:1.12.526=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.526=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.526=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-cloudwatch:1.12.546=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.546=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:jmespath-java:1.12.546=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.dynatrace.metric.util:dynatrace-metric-utils-java:1.5.0=runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath From 5ecb34866aadb1629e78e5700bab23f138a5603d Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 8 Sep 2023 14:21:57 -0700 Subject: [PATCH 3/5] Upgrade to SignalFx 1.0.34 Closes gh-4071 --- implementations/micrometer-registry-signalfx/gradle.lockfile | 2 +- samples/micrometer-samples-boot2/gradle.lockfile | 2 +- samples/micrometer-samples-core/gradle.lockfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/implementations/micrometer-registry-signalfx/gradle.lockfile b/implementations/micrometer-registry-signalfx/gradle.lockfile index 5fc5db79f2..124f2fc85f 100644 --- a/implementations/micrometer-registry-signalfx/gradle.lockfile +++ b/implementations/micrometer-registry-signalfx/gradle.lockfile @@ -15,7 +15,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=chec com.google.j2objc:j2objc-annotations:1.3=checkstyle,nohttp com.puppycrawl.tools:checkstyle:8.33=nohttp com.puppycrawl.tools:checkstyle:9.3=checkstyle -com.signalfx.public:signalfx-java:1.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.signalfx.public:signalfx-java:1.0.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle,nohttp commons-collections:commons-collections:3.2.2=checkstyle,nohttp commons-logging:commons-logging:1.2=nohttp diff --git a/samples/micrometer-samples-boot2/gradle.lockfile b/samples/micrometer-samples-boot2/gradle.lockfile index edbe23b11e..1dbbee4f92 100644 --- a/samples/micrometer-samples-boot2/gradle.lockfile +++ b/samples/micrometer-samples-boot2/gradle.lockfile @@ -49,7 +49,7 @@ com.netflix.spectator:spectator-reg-atlas:1.3.10=compileClasspath,productionRunt com.puppycrawl.tools:checkstyle:8.33=nohttp com.puppycrawl.tools:checkstyle:9.3=checkstyle com.rabbitmq:amqp-client:5.14.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.signalfx.public:signalfx-java:1.0.33=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.signalfx.public:signalfx-java:1.0.34=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.wavefront:wavefront-sdk-java:3.0.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle,nohttp diff --git a/samples/micrometer-samples-core/gradle.lockfile b/samples/micrometer-samples-core/gradle.lockfile index e622c56f33..c92c7b0d3d 100644 --- a/samples/micrometer-samples-core/gradle.lockfile +++ b/samples/micrometer-samples-core/gradle.lockfile @@ -54,7 +54,7 @@ com.netflix.spectator:spectator-reg-atlas:1.3.10=compileClasspath,runtimeClasspa com.puppycrawl.tools:checkstyle:8.33=nohttp com.puppycrawl.tools:checkstyle:9.3=checkstyle com.rabbitmq:amqp-client:5.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.signalfx.public:signalfx-java:1.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.signalfx.public:signalfx-java:1.0.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.paranamer:paranamer:2.8=runtimeClasspath,testRuntimeClasspath com.typesafe.scala-logging:scala-logging_2.13:3.9.3=runtimeClasspath,testRuntimeClasspath From d1f537d4bc03fce5079bbb4fa0aeb20d37ce0500 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 8 Sep 2023 14:24:51 -0700 Subject: [PATCH 4/5] Upgrade to H2 2.2.222 Closes gh-4072 --- micrometer-core/gradle.lockfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile index 23fa58849d..74bebef5a1 100644 --- a/micrometer-core/gradle.lockfile +++ b/micrometer-core/gradle.lockfile @@ -30,7 +30,7 @@ com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileCla com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.h2database:h2:2.2.220=testCompileClasspath,testRuntimeClasspath +com.h2database:h2:2.2.222=testCompileClasspath,testRuntimeClasspath com.hazelcast:hazelcast:5.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.4=testCompileClasspath,testRuntimeClasspath com.netflix.archaius:archaius-core:0.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath From e97555af5191a83e5f24f9b1d4468a2b0a8e8ef8 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 8 Sep 2023 14:26:05 -0700 Subject: [PATCH 5/5] Upgrade to Testcontainers 1.19.0 Closes gh-4073 --- .../gradle.lockfile | 10 +++++----- .../micrometer-registry-otlp/gradle.lockfile | 10 +++++----- micrometer-core/gradle.lockfile | 20 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/implementations/micrometer-registry-elastic/gradle.lockfile b/implementations/micrometer-registry-elastic/gradle.lockfile index 639797d143..070f660d5b 100644 --- a/implementations/micrometer-registry-elastic/gradle.lockfile +++ b/implementations/micrometer-registry-elastic/gradle.lockfile @@ -7,9 +7,9 @@ ch.qos.logback:logback-classic:1.2.3=checkstyle,nohttp,nohttp-cli ch.qos.logback:logback-core:1.2.12=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=checkstyle,nohttp,nohttp-cli com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.3.3=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.3.3=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.3.3=testCompileClasspath,testRuntimeClasspath com.github.tomakehurst:wiremock-jre8-standalone:2.33.2=testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=nohttp @@ -73,7 +73,7 @@ org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.26=nohttp,nohttp-cli org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:elasticsearch:1.16.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.18.3=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.19.0=testCompileClasspath,testRuntimeClasspath ru.lanwen.wiremock:wiremock-junit5:1.3.1=testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,archives,signatures,testAnnotationProcessor diff --git a/implementations/micrometer-registry-otlp/gradle.lockfile b/implementations/micrometer-registry-otlp/gradle.lockfile index f65b3a8a97..5940acc1b5 100644 --- a/implementations/micrometer-registry-otlp/gradle.lockfile +++ b/implementations/micrometer-registry-otlp/gradle.lockfile @@ -5,9 +5,9 @@ antlr:antlr:2.7.7=nohttp ch.qos.logback:logback-classic:1.2.3=checkstyle,nohttp,nohttp-cli ch.qos.logback:logback-core:1.2.3=checkstyle,nohttp,nohttp-cli com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.3.3=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.3.3=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.3.3=testCompileClasspath,testRuntimeClasspath com.github.tomakehurst:wiremock-jre8-standalone:2.33.2=testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=nohttp @@ -83,8 +83,8 @@ org.reflections:reflections:0.10.2=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.26=nohttp,nohttp-cli org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.18.3=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.19.0=testCompileClasspath,testRuntimeClasspath ru.lanwen.wiremock:wiremock-junit5:1.3.1=testCompileClasspath,testRuntimeClasspath uk.org.webcompere:system-stubs-core:2.0.2=testCompileClasspath,testRuntimeClasspath uk.org.webcompere:system-stubs-jupiter:2.0.2=testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile index 74bebef5a1..beb04cd4ca 100644 --- a/micrometer-core/gradle.lockfile +++ b/micrometer-core/gradle.lockfile @@ -14,9 +14,9 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2=compileClasspath,run com.fasterxml.jackson:jackson-bom:2.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml:classmate:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.3.3=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.3.3=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.3.3=testCompileClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.4.9-1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.tomakehurst:wiremock-jre8-standalone:2.33.2=testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,nohttp,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -206,13 +206,13 @@ org.springframework:spring-context:5.3.29=testCompileClasspath,testRuntimeClassp org.springframework:spring-core:5.3.29=testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.29=testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.29=testCompileClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:kafka:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:mongodb:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.18.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.18.3=testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:kafka:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:mongodb:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.19.0=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.19.0=testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ru.lanwen.wiremock:wiremock-junit5:1.3.1=testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,archives,signatures,testAnnotationProcessor