Skip to content

Commit 88c54da

Browse files
jonatan-ivanovjonatan-ivanov
committed
Merge branch '1.8.x' into 1.9.x
# Conflicts: # benchmarks/benchmarks-core/gradle.lockfile # dependencies.gradle # implementations/micrometer-registry-cloudwatch/gradle.lockfile # implementations/micrometer-registry-dynatrace/gradle.lockfile # implementations/micrometer-registry-elastic/gradle.lockfile # implementations/micrometer-registry-ganglia/gradle.lockfile # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-jmx/gradle.lockfile # implementations/micrometer-registry-otlp/gradle.lockfile # implementations/micrometer-registry-prometheus/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-boot2/build.gradle # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile # samples/micrometer-samples-javalin/gradle.lockfile
2 parents 37c074e + a0a2bea commit 88c54da

37 files changed

Lines changed: 498 additions & 495 deletions

File tree

‎benchmarks/benchmarks-core/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ buildscript {
1111
dependencies {
1212
classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
1313
classpath 'com.netflix.nebula:gradle-info-plugin:11.4.1'
14-
classpath 'com.netflix.nebula:nebula-release-plugin:16.0.0'
14+
classpath 'com.netflix.nebula:nebula-release-plugin:16.1.0'
1515
classpath 'com.netflix.nebula:nebula-publishing-plugin:18.4.0'
1616
classpath 'com.netflix.nebula:nebula-project-plugin:9.4.0'
1717
classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
1818
classpath 'org.gradle:test-retry-gradle-plugin:1.4.1'
1919
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
2020
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
21-
classpath 'de.undercouch:gradle-download-task:5.0.2'
21+
classpath 'de.undercouch:gradle-download-task:5.2.1'
2222
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.35'
2323

2424
constraints {

‎buildscript-gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dependencies.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ def VERSIONS = [
66
'com.fasterxml.jackson.core:jackson-databind:latest.release',
77
'com.github.ben-manes.caffeine:caffeine:2.+',
88
'com.github.charithe:kafka-junit:latest.release',
9-
'com.github.tomakehurst:wiremock-jre8-standalone:latest.release',
9+
// pinned to avoid issues with shaded slf4j version - see gh-3414
10+
'com.github.tomakehurst:wiremock-jre8-standalone:2.33.+',
1011
'com.google.cloud:google-cloud-monitoring:3.2.+',
1112
'com.google.dagger:dagger:2.11',
1213
'com.google.dagger:dagger-compiler:2.11',
@@ -62,8 +63,8 @@ def VERSIONS = [
6263
'org.hsqldb:hsqldb:2.5.+', // 2.6.0 requires JDK 11.
6364
'org.jooq:jooq:3.14.+',
6465
'org.jsr107.ri:cache-ri-impl:1.0.0',
65-
'org.junit.jupiter:junit-jupiter:5.8.+', // Not using latest.release to avoid using a milestone version.
66-
'org.junit.platform:junit-platform-launcher:1.8.+',
66+
'org.junit.jupiter:junit-jupiter:5.9.+', // Not using latest.release to avoid using a milestone version.
67+
'org.junit.platform:junit-platform-launcher:1.9.+',
6768
'org.latencyutils:LatencyUtils:latest.release',
6869
'org.mockito:mockito-core:latest.release',
6970
'org.mockito:mockito-inline:latest.release',

‎implementations/micrometer-registry-appoptics/gradle.lockfile‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-atlas/gradle.lockfile‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-azure-monitor/gradle.lockfile‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎implementations/micrometer-registry-cloudwatch/gradle.lockfile‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)