Skip to content

Commit

Permalink
Merge #3218 into 3.5.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
chemicL committed Oct 10, 2022
2 parents ee7aa8a + 2735ba1 commit 28e7fc9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ baselinePerfExtra = "3.4.8"

# Other shared versions
asciidoctor = "3.3.2"
bytebuddy = "1.12.14"
bytebuddy = "1.12.17"
jmh = "1.35"
junit = "5.9.0"
junit = "5.9.1"
#note that some micrometer artifacts like context-propagation has a different version directly set in libraries below
micrometer = "1.10.0-SNAPSHOT" # was -M6
reactiveStreams = "1.0.4"
Expand Down Expand Up @@ -41,24 +41,24 @@ micrometer-docsGenerator-metrics = { module = "io.micrometer:micrometer-docs-gen
micrometer-observation-test = { module = "io.micrometer:micrometer-observation-test" }
micrometer-tracing-test = "io.micrometer:micrometer-tracing-integration-test:1.0.0-SNAPSHOT" # was -M8
micrometer-test = { module = "io.micrometer:micrometer-test" }
mockito = "org.mockito:mockito-core:4.7.0"
mockito = "org.mockito:mockito-core:4.8.0"
reactiveStreams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactiveStreams" }
reactiveStreams-tck = { module = "org.reactivestreams:reactive-streams-tck", version.ref = "reactiveStreams" }
reactor-perfBaseline-core = { module = "io.projectreactor:reactor-core", version.ref = "baselinePerfCore" }
reactor-perfBaseline-extra = { module = "io.projectreactor.addons:reactor-extra", version.ref = "baselinePerfExtra" }
slf4j = "org.slf4j:slf4j-api:1.7.36"
testNg = "org.testng:testng:7.5"
testNg = "org.testng:testng:7.5" # since 7.6 JDK8 is unsupported, don't bump
throwingFunction = "com.pivovarit:throwing-function:1.5.1"

[plugins]
artifactory = { id = "com.jfrog.artifactory", version = "4.29.0" }
artifactory = { id = "com.jfrog.artifactory", version = "4.29.1" }
asciidoctor-convert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor" }
asciidoctor-pdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor" }
bnd = { id = "biz.aQute.bnd.builder", version = "6.3.1" }
download = { id = "de.undercouch.download", version = "5.1.2" }
download = { id = "de.undercouch.download", version = "5.2.1" }
japicmp = { id = "me.champeau.gradle.japicmp", version = "0.4.1" }
jcstress = { id = "io.github.reyerizo.gradle.jcstress", version = "0.8.13" }
jcstress = { id = "io.github.reyerizo.gradle.jcstress", version = "0.8.14" }
nohttp = { id = "io.spring.nohttp", version = "0.0.10" }
shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
spotless = { id = "com.diffplug.spotless", version = "6.10.0" }
spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
testsets = { id = "org.unbroken-dome.test-sets", version = "4.0.0" }
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {
//the plugin feature only works with the -original jar !!
//otherwise implemented Plugin interface is the shaded one
classpath files("@AGENT@")
//version 1.12.13 cannot be found on Gradle Plugin Repository, this syntax allows looking it up on MavenCentral
//version 1.12.17 cannot be found on Gradle Plugin Repository, this syntax allows looking it up on MavenCentral
classpath 'net.bytebuddy:byte-buddy-gradle-plugin:@BYTE_BUDDY_VERSION@'
}
}
Expand Down

0 comments on commit 28e7fc9

Please sign in to comment.