From cdb49d1bfb60096a2e55f6157a162169efba815d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 06:24:39 -0800 Subject: [PATCH 1/2] Bump testcontainers from 1.20.4 to 1.20.5 (#979) Bumps `testcontainers` from 1.20.4 to 1.20.5. Updates `org.testcontainers:testcontainers` from 1.20.4 to 1.20.5 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.4...1.20.5) Updates `org.testcontainers:junit-jupiter` from 1.20.4 to 1.20.5 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.4...1.20.5) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1dbc9faa..ceda1c9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ assertj = "3.26.3" awaitility = "4.2.2" mockito = "5.14.2" wiremock = "3.0.1" -testcontainers = "1.20.4" +testcontainers = "1.20.5" braveBom = "6.0.3" bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" From e36f43fd066adef04cbd72bdf86adc1967e57f6b Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 21 Feb 2025 14:23:22 -0800 Subject: [PATCH 2/2] Add JUnit Platform Launcher Closes gh-982 --- docs/build.gradle | 3 ++- gradle/libs.versions.toml | 2 ++ .../micrometer-tracing-bridge-brave/build.gradle | 3 ++- .../micrometer-tracing-bridge-otel/build.gradle | 3 ++- .../micrometer-tracing-reporter-wavefront/build.gradle | 3 ++- .../micrometer-tracing-integration-test/build.gradle | 3 ++- micrometer-tracing-tests/micrometer-tracing-test/build.gradle | 3 ++- micrometer-tracing/build.gradle | 3 ++- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index e8b77b9e..0665d611 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -34,7 +34,8 @@ dependencies { testImplementation project(':micrometer-tracing-test') testImplementation project(':micrometer-tracing-integration-test') testImplementation libs.aspectjweaver - testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation libs.junitJupiter + testRuntimeOnly libs.junitPlatformLauncher testImplementation libs.mockitoCore testImplementation libs.assertj testImplementation libs.springContext diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a2babc6f..888fb121 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,6 +43,8 @@ jmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } jmhGeneratorAnnProcess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" } junitBom = { module = "org.junit:junit-bom", version.ref = "junit" } +junitJupiter = { module = "org.junit.jupiter:junit-jupiter" } +junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher" } log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } micrometerContextPropagation = { module = "io.micrometer:context-propagation", version.ref = "micrometerContextPropagation" } diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle index e2c5888f..64ad41ed 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle @@ -17,7 +17,8 @@ dependencies { testImplementation project(':micrometer-tracing-test') testImplementation 'io.micrometer:micrometer-core' testImplementation 'io.micrometer:micrometer-observation-test' - testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation libs.junitJupiter + testRuntimeOnly libs.junitPlatformLauncher testImplementation libs.assertj testImplementation libs.awaitility testImplementation 'io.zipkin.brave:brave-instrumentation-http-tests' diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle index fb4a4bdf..6bd3fee6 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle @@ -19,7 +19,8 @@ dependencies { testImplementation project(':micrometer-tracing-test') testImplementation 'io.micrometer:micrometer-core' testImplementation 'io.micrometer:micrometer-observation-test' - testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation libs.junitJupiter + testRuntimeOnly libs.junitPlatformLauncher testImplementation libs.assertj testImplementation libs.awaitility testImplementation libs.mockitoCore diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle index e4cc717a..821708e9 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle @@ -23,7 +23,8 @@ dependencies { // Tests testImplementation project(':micrometer-tracing-test') - testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation libs.junitJupiter + testRuntimeOnly libs.junitPlatformLauncher testImplementation libs.assertj testImplementation libs.awaitility testImplementation libs.logback diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle index 7faa5b22..a0df4108 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle @@ -43,10 +43,11 @@ dependencies { api libs.wavefrontReporter // Tests - api 'org.junit.jupiter:junit-jupiter' + api libs.junitJupiter api libs.assertj // Tests for tests + testRuntimeOnly libs.junitPlatformLauncher testImplementation libs.springContext testImplementation libs.mockitoCore testImplementation libs.wiremock diff --git a/micrometer-tracing-tests/micrometer-tracing-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-test/build.gradle index dcce692d..c94e38f1 100644 --- a/micrometer-tracing-tests/micrometer-tracing-test/build.gradle +++ b/micrometer-tracing-tests/micrometer-tracing-test/build.gradle @@ -8,7 +8,8 @@ dependencies { // Tests for tests testImplementation libs.logback - testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation libs.junitJupiter + testRuntimeOnly libs.junitPlatformLauncher testImplementation 'org.mockito:mockito-core' // aspects diff --git a/micrometer-tracing/build.gradle b/micrometer-tracing/build.gradle index 247e80ee..997333cd 100644 --- a/micrometer-tracing/build.gradle +++ b/micrometer-tracing/build.gradle @@ -18,7 +18,8 @@ dependencies { optionalApi libs.logback optionalApi libs.log4j - testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation libs.junitJupiter + testRuntimeOnly libs.junitPlatformLauncher testImplementation libs.assertj testImplementation libs.mockitoCore testImplementation libs.mockitoJunit