diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8809b895..b0d4f566 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,19 +5,109 @@ registries: url: https://plugins.gradle.org/m2 username: dummy # Required by dependabot password: dummy # Required by dependabot + maven-central: + type: maven-repository + url: https://repo1.maven.org/maven2/ + username: dummy # Required by dependabot + password: dummy # Required by dependabot updates: - - package-ecosystem: "gradle" + # Github Actions + - package-ecosystem: "github-actions" directory: "/" - target-branch: "1.0.x" # oldest OSS supported branch + target-branch: "1.0.x" # oldest supported branch, we will merge forward + schedule: + interval: "weekly" + # Build dependencies + - package-ecosystem: gradle + directory: / + schedule: + interval: daily + target-branch: 1.0.x + groups: + netflix-plugins: + patterns: + - "com.netflix.nebula*" + update-types: + - minor + - patch allow: + - dependency-name: "gradle.plugin.com.hierynomus.gradle.plugins*" + - dependency-name: "com.netflix.nebula*" + - dependency-name: "io.spring.nohttp*" + - dependency-name: "io.github.gradle-nexus*" + - dependency-name: "io.spring.javaformat*" + - dependency-name: "io.spring.ge.conventions*" - dependency-name: "com.gradle*" + - dependency-name: "org.gradle*" + ignore: + # only upgrade minor and patch versions for plugin dependencies + - dependency-name: "*" + update-types: + - version-update:semver-major registries: - gradle-plugin-portal + - maven-central + milestone: 10 + - package-ecosystem: gradle + directory: / schedule: - interval: "weekly" - open-pull-requests-limit: 10 - - package-ecosystem: "github-actions" - directory: "/" - target-branch: "1.0.x" # oldest OSS supported branch + interval: daily + target-branch: 1.1.x + groups: + netflix-plugins: + patterns: + - "com.netflix.nebula*" + update-types: + - minor + - patch + allow: + - dependency-name: "gradle.plugin.com.hierynomus.gradle.plugins*" + - dependency-name: "com.netflix.nebula*" + - dependency-name: "io.spring.nohttp*" + - dependency-name: "io.github.gradle-nexus*" + - dependency-name: "io.spring.javaformat*" + - dependency-name: "io.spring.ge.conventions*" + - dependency-name: "com.gradle*" + - dependency-name: "org.gradle*" + ignore: + # only upgrade minor and patch versions for plugin dependencies + - dependency-name: "*" + update-types: + - version-update:semver-major + registries: + - gradle-plugin-portal + - maven-central + milestone: 10 + # Non-build dependencies maintenance branch + - package-ecosystem: gradle + directory: /gradle schedule: - interval: "weekly" + interval: daily + target-branch: 1.0.x + ignore: + # only upgrade patch versions + - dependency-name: "*" + update-types: + - version-update:semver-major + - version-update:semver-minor + - package-ecosystem: gradle + directory: /gradle + schedule: + interval: daily + target-branch: 1.1.x + ignore: + # only upgrade patch versions + - dependency-name: "*" + update-types: + - version-update:semver-major + - version-update:semver-minor + - package-ecosystem: gradle + directory: / + schedule: + interval: daily + target-branch: main + ignore: + # only upgrade by minor or patch + - dependency-name: "*" + update-types: + - version-update:semver-major diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 48f83f60..643c5ad9 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -6,5 +6,5 @@ jobs: name: "Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.0.0 + - uses: actions/checkout@v4.1.0 - uses: gradle/wrapper-validation-action@v1 diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 2f878a0a..59cdaf66 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -1,18 +1,18 @@ dependencies { jmh project(':micrometer-tracing-bridge-brave') jmh project(':micrometer-tracing-bridge-otel') - jmh 'org.openjdk.jmh:jmh-core:latest.release' + jmh libs.jmh jmh 'io.zipkin.brave:brave-tests' - jmh 'ch.qos.logback:logback-classic' + jmh libs.logback // Nebula doesn't like having jmhAnnotationProcessor without jmh so we just add it twice. - jmh 'org.openjdk.jmh:jmh-generator-annprocess:latest.release' - jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:latest.release' + jmh libs.jmhGeneratorAnnProcess + jmhAnnotationProcessor libs.jmhGeneratorAnnProcess } jmh { - jmhVersion = '1.36' + jmhVersion = '1.37' fork = 1 warmupIterations = 1 iterations = 1 diff --git a/build.gradle b/build.gradle index e758fe10..563a564a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,17 +9,17 @@ buildscript { } dependencies { - classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1' - classpath 'com.netflix.nebula:nebula-release-plugin:16.1.0' - classpath 'com.netflix.nebula:nebula-publishing-plugin:20.1.0' - classpath 'com.netflix.nebula:nebula-project-plugin:10.1.2' - classpath 'io.spring.nohttp:nohttp-gradle:0.0.11' - classpath 'io.github.gradle-nexus:publish-plugin:1.3.0' - classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39' - classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.1' + classpath libs.plugin.license + classpath libs.plugin.nebulaRelease + classpath libs.plugin.nebulaPublishing + classpath libs.plugin.nebulaProject + classpath libs.plugin.noHttp + classpath libs.plugin.nexusPublish + classpath libs.plugin.javaformat + classpath libs.plugin.jmh constraints { - classpath('org.ow2.asm:asm:7.3.1') { + classpath(libs.asmForPlugins) { because 'Supports modern JDKs' } } @@ -74,11 +74,11 @@ subprojects { // have to add the dependency in every project, which is tedious so just do it here. dependencies { // JSR-305 only used for non-required meta-annotations - optionalApi 'com.google.code.findbugs:jsr305:latest.release' - checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:latest.release' - jmh 'org.openjdk.jmh:jmh-core:1.36' - jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.36' - jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.36' + optionalApi libs.jsr305 + checkstyle libs.javaFormatForPlugins + jmh libs.jmh + jmh libs.jmhGeneratorAnnProcess + jmhAnnotationProcessor libs.jmhGeneratorAnnProcess jmh 'net.sf.jopt-simple:jopt-simple' } diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile deleted file mode 100644 index 9fe233d7..00000000 --- a/buildscript-gradle.lockfile +++ /dev/null @@ -1,85 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -antlr:antlr:2.7.7=classpath -ch.qos.logback:logback-classic:1.2.3=classpath -ch.qos.logback:logback-core:1.2.3=classpath -com.fasterxml.jackson:jackson-bom:2.11.0=classpath -com.github.zafarkhaja:java-semver:0.9.0=classpath -com.google.code.findbugs:jsr305:3.0.2=classpath -com.google.errorprone:error_prone_annotations:2.3.4=classpath -com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:29.0-jre=classpath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath -com.google.j2objc:j2objc-annotations:1.3=classpath -com.googlecode.javaewah:JavaEWAH:1.1.12=classpath -com.jcraft:jsch.agentproxy.connector-factory:0.0.7=classpath -com.jcraft:jsch.agentproxy.core:0.0.7=classpath -com.jcraft:jsch.agentproxy.pageant:0.0.7=classpath -com.jcraft:jsch.agentproxy.sshagent:0.0.7=classpath -com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=classpath -com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=classpath -com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=classpath -com.jcraft:jzlib:1.1.2=classpath -com.mycila.xmltool:xmltool:3.3=classpath -com.mycila:license-maven-plugin:3.0=classpath -com.mycila:mycila-xmltool:4.4.ga=classpath -com.netflix.nebula:gradle-contacts-plugin:7.0.0=classpath -com.netflix.nebula:gradle-dependency-lock-plugin:13.1.0=classpath -com.netflix.nebula:gradle-info-plugin:12.0.0=classpath -com.netflix.nebula:gradle-scm-plugin:7.0.0=classpath -com.netflix.nebula:nebula-dependencies-comparison:0.2.1=classpath -com.netflix.nebula:nebula-gradle-interop:2.0.0=classpath -com.netflix.nebula:nebula-project-plugin:10.1.2=classpath -com.netflix.nebula:nebula-publishing-plugin:20.1.0=classpath -com.netflix.nebula:nebula-release-plugin:16.1.0=classpath -com.perforce:p4java:2015.2.1365273=classpath -com.puppycrawl.tools:checkstyle:8.33=classpath -com.squareup.moshi:moshi:1.12.0=classpath -com.squareup.okio:okio:2.10.0=classpath -com.trilead:trilead-ssh2:1.0.0-build220=classpath -commons-beanutils:commons-beanutils:1.9.4=classpath -commons-collections:commons-collections:3.2.2=classpath -commons-logging:commons-logging:1.2=classpath -de.regnis.q.sequence:sequence-library:1.0.3=classpath -gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1=classpath -info.picocli:picocli:4.3.1=classpath -io.github.gradle-nexus:publish-plugin:1.3.0=classpath -io.spring.javaformat:spring-javaformat-formatter-shaded:0.0.39=classpath -io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39=classpath -io.spring.nohttp:nohttp-checkstyle:0.0.11=classpath -io.spring.nohttp:nohttp-gradle:0.0.11=classpath -io.spring.nohttp:nohttp:0.0.11=classpath -joda-time:joda-time:2.10=classpath -me.champeau.jmh:jmh-gradle-plugin:0.7.1=classpath -net.java.dev.jna:jna-platform:5.7.0=classpath -net.java.dev.jna:jna:5.7.0=classpath -net.java.dev.jna:platform:3.4.0=classpath -net.sf.jopt-simple:jopt-simple:5.0.4=classpath -net.sf.saxon:Saxon-HE:9.9.1-7=classpath -org.ajoberstar.grgit:grgit-core:4.0.2=classpath -org.antlr:antlr-runtime:3.4=classpath -org.antlr:antlr4-runtime:4.8-1=classpath -org.apache.commons:commons-math3:3.2=classpath -org.apache.commons:commons-pool2:2.2=classpath -org.apache.maven:maven-settings-builder:3.0.4=classpath -org.apache.maven:maven-settings:3.0.4=classpath -org.checkerframework:checker-qual:2.11.1=classpath -org.codehaus.plexus:plexus-component-annotations:1.5.5=classpath -org.codehaus.plexus:plexus-interpolation:1.14=classpath -org.codehaus.plexus:plexus-utils:2.0.6=classpath -org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.7.20=classpath -org.jetbrains:annotations:13.0=classpath -org.openjdk.jmh:jmh-core:1.36=classpath -org.slf4j:slf4j-api:1.7.30=classpath -org.sonatype.plexus:plexus-cipher:1.4=classpath -org.sonatype.plexus:plexus-sec-dispatcher:1.3=classpath -org.springframework:spring-asm:3.1.3.RELEASE=classpath -org.springframework:spring-core:3.1.3.RELEASE=classpath -org.tmatesoft.sqljet:sqljet:1.1.10=classpath -org.tmatesoft.svnkit:svnkit:1.8.12=classpath -empty= diff --git a/dependencies.gradle b/dependencies.gradle index 7f05ac90..a570cda1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,47 +1,46 @@ def VERSIONS = [ - 'javax.servlet:javax.servlet-api:latest.release', - 'jakarta.platform:jakarta.jakartaee-web-api:9.+', + libs.javaxServlet, + libs.jakartaWeb, - 'io.micrometer:context-propagation:1.0.+', + libs.micrometerContextPropagation, - 'aopalliance:aopalliance:1.0', - 'org.aspectj:aspectjweaver:1.8.+', - 'org.springframework:spring-context:5.+', - 'org.springframework:spring-core:5+', + libs.aopAlliance, + libs.aspectjweaver, + libs.springContext, + libs.springCore, // logging - 'ch.qos.logback:logback-classic:1.2.+', - 'org.apache.logging.log4j:log4j-core:2.+', - 'org.slf4j:slf4j-api:1.7.+', + libs.logback, + libs.log4j, + libs.slf4j, // otel - 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.+', + libs.otelInstrumentation, // zipkin - 'io.zipkin.aws:brave-propagation-aws:latest.release', + libs.zipkinAws, // wavefront - 'com.wavefront:wavefront-sdk-java:3.+', - 'com.wavefront:wavefront-internal-reporter-java:1.+', + libs.wavefrontSdk, + libs.wavefrontReporter, // test - 'org.assertj:assertj-core:latest.release', - 'org.awaitility:awaitility:latest.release', - 'org.mockito:mockito-core:latest.release', - 'org.mockito:mockito-inline:latest.release', - 'org.mockito:mockito-junit-jupiter:latest.release', - 'com.github.tomakehurst:wiremock-jre8-standalone:latest.release', - 'org.testcontainers:testcontainers:latest.release', - 'org.testcontainers:junit-jupiter:latest.release' + libs.assertj, + libs.awaitility, + libs.mockitoCore, + libs.mockitoJunit, + libs.wiremock, + libs.testcontainers, + libs.testcontainersJunit ] def MICROMETER_PLATFORM_VERSIONS = [ - 'io.micrometer:micrometer-bom:1.12.+' + libs.micrometerBom ] def PLATFORM_VERSIONS = [ - 'io.zipkin.brave:brave-bom:5.+', + libs.braveBom, // opentelemetry-instrumentation-api dependency above with this - 'io.opentelemetry:opentelemetry-bom:1.+', - 'io.opentelemetry:opentelemetry-bom-alpha:1.+', - 'io.projectreactor:reactor-bom:latest.release', - 'org.junit:junit-bom:5.10.+' + libs.otelBom, + libs.otelBomAlpha, + libs.reactorBom, + libs.junitBom ] subprojects { diff --git a/docs/build.gradle b/docs/build.gradle index 0eb70f59..b49b851c 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -35,7 +35,7 @@ dependencies { testImplementation project(':micrometer-tracing-integration-test') testImplementation 'org.aspectj:aspectjweaver' testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.mockito:mockito-inline' + testImplementation 'org.mockito:mockito-core' testImplementation 'org.assertj:assertj-core' testImplementation 'org.springframework:spring-context' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..47cdd38a --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,73 @@ +[versions] +micrometer = "1.12.0-SNAPSHOT" +junit = "5.10.0" +javaxServlet="4.0.1" +jmh="1.37" +micrometerContextPropagation="1.0.6-SNAPSHOT" +jakartaWeb="9.1.0" +otelInstrumentation="1.30.0-alpha" +aopalliance="1.0" +zipkinAws="0.23.5" +otelBom="1.30.1" +logback = "1.2.12" +wavefrontSdk="3.4.0" +otelBomAlpha="1.30.1-alpha" +log4j = "2.20.0" +wavefrontReporter="1.7.16" +slf4j = "1.7.36" +assertj = "3.24.2" +awaitility = "4.2.0" +mockito = "5.5.0" +wiremock = "3.0.1" +testcontainers = "1.19.0" +braveBom = "5.16.0" +reactorBom = "2022.0.11" +asmForPlugins = "7.3.1" +javaFormatForPlugins = "0.0.39" +jsr305 = "3.0.2" +aspectjweaver = "1.8.14" +spring = "5.3.29" + +[libraries] +aopAlliance = { module = "aopalliance:aopalliance", version.ref = "aopalliance" } +asmForPlugins = { module = "org.ow2.asm:asm", version.ref = "asmForPlugins" } +aspectjweaver = { module = "org.aspectj:aspectjweaver", version.ref = "aspectjweaver" } +assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } +awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" } +braveBom = { module = "io.zipkin.brave:brave-bom", version.ref = "braveBom" } +jakartaWeb = { module = "jakarta.platform:jakarta.jakartaee-web-api", version.ref = "jakartaWeb" } +javaFormatForPlugins = { module = "io.spring.javaformat:spring-javaformat-checkstyle", version.ref = "javaFormatForPlugins" } +javaxServlet = { module = "javax.servlet:javax.servlet-api", version.ref = "javaxServlet" } +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" } +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" } +micrometerBom = { module = "io.micrometer:micrometer-bom", version.ref = "micrometer" } +mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" } +mockitoJunit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } +otelBom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "otelBom" } +otelBomAlpha = { module = "io.opentelemetry:opentelemetry-bom-alpha", version.ref = "otelBomAlpha" } +otelInstrumentation = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv", version.ref = "otelInstrumentation" } +reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactorBom" } +slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } +springCore = { module = "org.springframework:spring-core", version.ref = "spring" } +springContext = { module = "org.springframework:spring-context", version.ref = "spring" } +testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } +testcontainersJunit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } +wavefrontSdk = { module = "com.wavefront:wavefront-sdk-java", version.ref = "wavefrontSdk" } +wavefrontReporter = { module = "com.wavefront:wavefront-internal-reporter-java", version.ref = "wavefrontReporter" } +wiremock = { module = "com.github.tomakehurst:wiremock-jre8-standalone", version.ref = "wiremock" } +zipkinAws = { module = "io.zipkin.aws:brave-propagation-aws", version.ref = "zipkinAws" } + +# plugin dependencies +plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" } +plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "16.1.0" } +plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" } +plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" } +plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } +plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.39" } +plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.1" } diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle index bfa585e0..1df2fd97 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle @@ -4,23 +4,23 @@ plugins { dependencies { api project(':micrometer-tracing') - api 'org.slf4j:slf4j-api' - optionalApi 'javax.servlet:javax.servlet-api' - optionalApi 'jakarta.platform:jakarta.jakartaee-web-api' + api libs.slf4j + optionalApi libs.javaxServlet + optionalApi libs.jakartaWeb api 'io.zipkin.brave:brave' api 'io.zipkin.brave:brave-context-slf4j' api 'io.zipkin.brave:brave-instrumentation-http' - api 'io.zipkin.aws:brave-propagation-aws' + api libs.zipkinAws testImplementation project(':micrometer-tracing-test') testImplementation 'io.micrometer:micrometer-core' testImplementation 'io.micrometer:micrometer-observation-test' testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.awaitility:awaitility' + testImplementation libs.assertj + testImplementation libs.awaitility testImplementation 'io.zipkin.brave:brave-instrumentation-http-tests' - testImplementation 'ch.qos.logback:logback-classic' + testImplementation libs.logback testImplementation 'io.projectreactor:reactor-core' testImplementation 'io.projectreactor:reactor-core-micrometer' } diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle index 6842d63e..2989ac43 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { api project(':micrometer-tracing') - api 'org.slf4j:slf4j-api' + api libs.slf4j api 'io.micrometer:micrometer-observation' api 'io.opentelemetry:opentelemetry-api' @@ -21,10 +21,10 @@ dependencies { testImplementation 'io.micrometer:micrometer-core' testImplementation 'io.micrometer:micrometer-observation-test' testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.awaitility:awaitility' - testImplementation 'org.mockito:mockito-core' - testImplementation 'ch.qos.logback:logback-classic' + testImplementation libs.assertj + testImplementation libs.awaitility + testImplementation libs.mockitoCore + testImplementation libs.logback testImplementation 'io.projectreactor:reactor-core' testImplementation 'io.projectreactor:reactor-core-micrometer' } diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle index afc5d209..e4cc717a 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle @@ -19,15 +19,15 @@ dependencies { optionalImplementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv' // Wavefront - implementation 'com.wavefront:wavefront-internal-reporter-java' + implementation libs.wavefrontReporter // Tests testImplementation project(':micrometer-tracing-test') testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.awaitility:awaitility' - testImplementation 'ch.qos.logback:logback-classic' - testImplementation 'org.mockito:mockito-core' + testImplementation libs.assertj + testImplementation libs.awaitility + testImplementation libs.logback + testImplementation libs.mockitoCore } configurations.optionalImplementation { diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle index 9bf865f0..3aa748d5 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle @@ -40,17 +40,17 @@ dependencies { } // Wavefront - api 'com.wavefront:wavefront-internal-reporter-java' + api libs.wavefrontReporter // Tests api 'org.junit.jupiter:junit-jupiter' - api 'org.assertj:assertj-core' + api libs.assertj // Tests for tests - testImplementation 'org.mockito:mockito-core' - testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone' - testImplementation 'org.awaitility:awaitility' - testImplementation 'ch.qos.logback:logback-classic' + testImplementation libs.mockitoCore + testImplementation libs.wiremock + testImplementation libs.awaitility + testImplementation libs.logback testImplementation 'org.testcontainers:testcontainers' testImplementation 'org.testcontainers:junit-jupiter' } diff --git a/micrometer-tracing-tests/micrometer-tracing-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-test/build.gradle index 3273f028..59fca682 100644 --- a/micrometer-tracing-tests/micrometer-tracing-test/build.gradle +++ b/micrometer-tracing-tests/micrometer-tracing-test/build.gradle @@ -4,16 +4,16 @@ plugins { dependencies { api project(':micrometer-tracing') - api 'org.assertj:assertj-core' + api libs.assertj // Tests for tests - testImplementation 'ch.qos.logback:logback-classic' + testImplementation libs.logback testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.mockito:mockito-core' // aspects - testImplementation 'org.springframework:spring-context' - testImplementation 'org.aspectj:aspectjweaver' + testImplementation libs.springContext + testImplementation libs.aspectjweaver testImplementation 'io.projectreactor:reactor-core' testImplementation 'io.projectreactor:reactor-core-micrometer' diff --git a/micrometer-tracing/build.gradle b/micrometer-tracing/build.gradle index 93f6d535..d6ef0088 100644 --- a/micrometer-tracing/build.gradle +++ b/micrometer-tracing/build.gradle @@ -5,23 +5,23 @@ plugins { dependencies { api 'io.micrometer:micrometer-observation' api 'io.micrometer:context-propagation' - api 'aopalliance:aopalliance' + api libs.aopAlliance // aspects - optionalApi 'org.aspectj:aspectjweaver' + optionalApi libs.aspectjweaver // exemplars support optionalApi 'io.micrometer:micrometer-core' // log monitoring - optionalApi 'ch.qos.logback:logback-classic' - optionalApi 'org.apache.logging.log4j:log4j-core' + optionalApi libs.logback + optionalApi libs.log4j testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.mockito:mockito-core' - testImplementation 'org.mockito:mockito-junit-jupiter' + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.mockitoJunit // aspect - testImplementation 'org.springframework:spring-context' + testImplementation libs.springContext }