Skip to content

Commit

Permalink
Convert main to version catalog TOML file
Browse files Browse the repository at this point in the history
* Add com.netflix.nebula:gradle-info-plugin (we force its version on main)
* Add jakarta.jms:jakarta.jms-api
* Add com.squareup.retrofit2:retrofit
* Add org.apache.activemq:artemis-junit-5
* Add org.apache.activemq:artemis-jakarta-client:latest.release
* Add io.grpc:grpc-inprocess (was part of grpc-core)
* Remove mockito-inline; included in mockito-core and no longer released[1]
* Downgrade org.apache.httpcomponents.client5:httpclient5 from 5.3-alpha1 to 5.2.1
* Consistently use jakarta.servlet-api:5.0.0 instead of a mix of 4.0.4 and 5.0.0
* Upgrade versions coming from 1.11.x

[1] mockito/mockito#2945

See: gh-4095
  • Loading branch information
jonatan-ivanov committed Oct 5, 2023
1 parent b40acca commit 7cf0e0f
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 62 deletions.
5 changes: 5 additions & 0 deletions build.gradle
Expand Up @@ -2,6 +2,10 @@ buildscript {
ext.javaLanguageVersion = JavaLanguageVersion.of(JavaVersion.current().isJava11Compatible() ? JavaVersion.current().getMajorVersion() : 17)
ext.javaTargetVersion = JavaVersion.VERSION_1_8

dependencyLocking {
lockAllConfigurations()
}

repositories {
mavenCentral()
gradlePluginPortal()
Expand All @@ -12,6 +16,7 @@ buildscript {
classpath libs.plugin.nebulaRelease
classpath libs.plugin.nebulaPublishing
classpath libs.plugin.nebulaProject
classpath libs.plugin.nebulaInfo
classpath libs.plugin.noHttp
classpath libs.plugin.nexusPublish
classpath libs.plugin.javaformat
Expand Down
5 changes: 5 additions & 0 deletions dependencies.gradle
Expand Up @@ -28,6 +28,7 @@ def VERSIONS = [
libs.dropwizardMetricsJmx,
libs.grpcApi,
libs.grpcCore,
libs.grpcInprocess,
libs.grpcServices,
libs.grpcStubs,
libs.grpcAlts,
Expand All @@ -36,6 +37,8 @@ def VERSIONS = [
libs.prometheusClient,
libs.prometheusPushgateway,
libs.restAssured,
libs.retrofit2,
libs.jakarta.jmsApi,
libs.jakarta.servletApi,
libs.javax.cacheApi,
libs.javax.inject,
Expand All @@ -45,6 +48,8 @@ def VERSIONS = [
libs.kotlinxCoroutines,
libs.ehcache2,
libs.ehcache3,
libs.activemqArtemisJakartaClient,
libs.activemqArtemisJunit5,
libs.httpcomponents.async,
libs.httpcomponents.client,
libs.httpcomponents.client5,
Expand Down
1 change: 0 additions & 1 deletion docs/build.gradle
Expand Up @@ -34,7 +34,6 @@ dependencies {
testImplementation project(':micrometer-observation-test')
testImplementation 'org.aspectj:aspectjweaver'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.mockito:mockito-inline'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.springframework:spring-context'
testImplementation 'io.projectreactor:reactor-core'
Expand Down
7 changes: 3 additions & 4 deletions docs/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 37 additions & 30 deletions gradle/libs.versions.toml
@@ -1,27 +1,28 @@
[versions]
activemq-artemis = "2.31.0"
application-insights = "2.6.4"
archunit = "1.1.0"
asmForPlugins = "7.3.1"
aspectjweaver = "1.8.14"
assertj = "3.24.2"
awaitility = "4.2.0"
# legacy SDK
aws-cloudwatch = "1.12.546"
aws-cloudwatch = "1.12.563"
caffeine = "2.9.3"
cloudwatch2 = "2.20.143"
cloudwatch2 = "2.20.160"
colt = "1.2.0"
dagger = "2.11"
dropwizard-metrics = "4.2.19"
dropwizard-metrics = "4.2.20"
dropwizard-metrics5 = "5.0.0"
dynatrace-utils = "1.6.0"
dynatrace-utils = "2.0.0"
ehcache2 = "2.10.9.2"
ehcache3 = "3.10.8"
gmetric4j = "1.0.10"
google-cloud-monitoring = "3.15.0"
grpc = "1.54.0"
guava = "31.1-jre"
grpc = "1.58.0"
guava = "32.1.2-jre"
guice = "5.1.0"
h2 = "2.2.222"
h2 = "2.2.224"
hazelcast = "5.3.2"
hazelcast3 = "3.12.13"
hdrhistogram = "2.1.12"
Expand All @@ -35,48 +36,50 @@ httpcomponents-client5 = "5.2.1"
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
hystrix = "1.5.12"
jackson-databind = "2.15.0"
jackson-databind = "2.15.2"
javax-cache = "1.1.1"
javax-inject = "1"
jaxb = "2.3.1"
jetty = "9.4.51.v20230217"
jetty11 = "11.0.14"
jersey2 = "2.39.1"
jersey3 = "3.0.10"
jetty = "9.4.52.v20230823"
jetty11 = "11.0.16"
jersey2 = "2.40"
jersey3 = "3.0.11"
jmh = "1.37"
jooq = "3.14.16"
jsr107 = "1.0.0"
jsr305 = "3.0.2"
junit = "5.9.3"
junit = "5.10.0"
junit-platform = "1.9.3"
kafka = "2.8.2"
kafka-junit = "4.2.4"
kafka-junit = "4.2.7"
latency-utils = "2.0.3"
logback = "1.2.12"
log4j = "2.20.0"
maven-resolver = "1.9.7"
maven-resolver = "1.9.16"
mockito = "5.5.0"
mongo = "4.9.1"
netty = "4.1.97.Final"
mongo = "4.10.2"
netty = "4.1.99.Final"
newrelic-api = "5.14.0"
okhttp = "5.0.0-alpha.11" # TODO is compiling against an alpha version intentional?
postgre = "42.6.0"
prometheus = "0.16.0"
reactor = "2020.0.35"
rest-assured = "5.3.0"
signalfx = "1.0.34"
reactor = "2022.0.11"
rest-assured = "5.3.2"
signalfx = "1.0.35"
slf4j = "1.7.36"
spectator-atlas = "1.6.10"
spring = "5.3.30"
spring-javaformat = "0.0.39"
testcontainers = "1.19.0"
tomcat = "8.5.87"
wavefront = "3.1.0"
testcontainers = "1.19.1"
tomcat = "8.5.93"
wavefront = "3.4.1"
# pinned to avoid issues with shaded slf4j version - see gh-3414
wiremock = "2.33.2"
wiremock-junit5 = "1.3.1"

[libraries]
activemqArtemisJakartaClient = { module = "org.apache.activemq:artemis-jakarta-client", version.ref = "activemq-artemis" }
activemqArtemisJunit5 = { module = "org.apache.activemq:artemis-junit-5", version.ref = "activemq-artemis" }
applicationInsights = { module = "com.microsoft.azure:applicationinsights-core", version.ref = "application-insights" }
archunitJunit5 = { module = "com.tngtech.archunit:archunit-junit5", version.ref = "archunit" }
asmForPlugins = { module = "org.ow2.asm:asm", version.ref = "asmForPlugins" }
Expand Down Expand Up @@ -105,6 +108,7 @@ googleCloudMonitoring = { module = "com.google.cloud:google-cloud-monitoring", v
googleOauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version = "1.16.1"}
grpcApi = { module = "io.grpc:grpc-api", version.ref = "grpc" }
grpcCore = { module = "io.grpc:grpc-core", version.ref = "grpc" }
grpcInprocess = { module = "io.grpc:grpc-inprocess", version.ref = "grpc" }
grpcServices = { module = "io.grpc:grpc-services", version.ref = "grpc" }
grpcStubs = { module = "io.grpc:grpc-stubs", version.ref = "grpc" }
grpcAlts = { module = "io.grpc:grpc-alts", version.ref = "grpc" }
Expand All @@ -118,12 +122,13 @@ hdrhistogram = { module = "org.hdrhistogram:HdrHistogram", version.ref = "hdrhis
hibernateEntitymanager = { module = "org.hibernate:hibernate-entitymanager", version.ref = "hibernate" }
hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldb" }
httpcomponents-async = { module = "org.apache.httpcomponents:httpasyncclient", version.ref = "httpcomponents-async" }
httpcomponents-client = { module = "org.apache.httpcomponents:httpclient" , version.ref = "httpcomponents-client" }
httpcomponents-client = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpcomponents-client" }
httpcomponents-client5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpcomponents-client5" }
hystrix = { module = "com.netflix.hystrix:hystrix-core", version.ref = "hystrix" }
jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson-databind" }
jakarta-jmsApi = { module = "jakarta.jms:jakarta.jms-api", version = "3.1.0" }
jakarta-servletApi = { module = "jakarta.servlet:jakarta.servlet-api", version = "5.0.0" }
javalin = { module = "io.javalin:javalin", version = "5.4.2" }
javalin = { module = "io.javalin:javalin", version = "5.6.2" }
javax-cacheApi = { module = "javax.cache:cache-api", version.ref = "javax-cache" }
javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
javax-servletApi = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
Expand All @@ -145,7 +150,7 @@ jooq = { module = "org.jooq:jooq", version.ref = "jooq" }
jsonPath = { module = "com.jayway.jsonpath:json-path", version = "2.8.0" }
jsr107 = { module = "org.jsr107.ri:cache-ri-impl", version.ref = "jsr107" }
jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
junitBom = { module = "org.junit:junit-bom", version = "5.9.3" }
junitBom = { module = "org.junit:junit-bom", version.ref = "junit" }
junitJupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
kafkaClients = { module = "org.apache.kafka:kafka-clients", version.ref = "kafka" }
Expand All @@ -159,20 +164,21 @@ logback14 = {module = "ch.qos.logback:logback-classic", version = "1.4.11" }
log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
mavenResolverConnectorBasic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
mavenResolverTransportHttp = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver" }
mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.1" }
mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.4" }
mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mongoSync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongo" }
nettyBom = { module = "io.netty:netty-bom", version.ref = "netty" }
newrelicApi = { module = "com.newrelic.agent.java:newrelic-api", version.ref = "newrelic-api" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
# some proto are marked alpha, hence the alpha version. metrics proto is what we use and it is marked stable
openTelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version = "0.19.0-alpha" }
openTelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version = "1.0.0-alpha" }
osgiJunit5 = "org.osgi:org.osgi.test.junit5:1.2.1"
postgre = { module = "org.postgresql:postgresql", version.ref = "postgre" }
prometheusClient = { module = "io.prometheus:simpleclient_common", version.ref = "prometheus" }
prometheusPushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus" }
reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactor" }
restAssured = { module = "io.rest-assured:rest-assured", version.ref = "rest-assured" }
retrofit2 = { module = "com.squareup.retrofit2:retrofit", version = "2.9.0" }
signalfx = { module = "com.signalfx.public:signalfx-java", version.ref = "signalfx" }
slf4jApi = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
slfj4Simple = "org.slf4j:slf4j-simple:1.7.36"
Expand All @@ -194,9 +200,10 @@ wiremockJunit5 = { module = "ru.lanwen.wiremock:wiremock-junit5", version.ref =

# 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 = "17.1.0" }
plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.1.0" }
plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "17.2.2" }
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-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" }
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.ref = "spring-javaformat" }
Expand Down
4 changes: 4 additions & 0 deletions micrometer-bom/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 2 additions & 14 deletions micrometer-commons/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7cf0e0f

Please sign in to comment.