Remove dependencies.gradle and finish migration to catalog (#4045)

Signed-off-by: Dariusz Jędrzejczyk <dariusz.jedrzejczyk@broadcom.com>

Author: chemicL

.github/dependabot.yml

@@ -9,7 +9,7 @@ updates:
  - "status/need-triage"
  reviewers:
  - "reactor/core-team"
- # updates in the oldest maintenance branch, we'll forward-merge up to main
+ # Updates in the oldest maintenance branch. We'll forward-merge up to main
  target-branch: "3.7.x"
  ignore:
  # JSR166 backport is fixed
@@ -58,5 +58,5 @@ updates:
  - "type/dependency-upgrade"
  reviewers:
  - "reactor/core-team"
- # updates in oldest maintenance branch, we'll forward-merge up to main
+ # Updates in the oldest maintenance branch. We'll forward-merge up to main
  target-branch: "3.7.x"

benchmarks/build.gradle

@@ -16,12 +16,12 @@ dependencies {
  compileOnly libs.reactor.perfBaseline.coreMicrometer
  compileOnly libs.jsr305
 
- implementation "org.openjdk.jmh:jmh-core:$jmhVersion"
+ implementation libs.jmh.core
  implementation libs.reactor.perfBaseline.extra, {
  exclude group: 'io.projectreactor', module: 'reactor-core'
  }
  implementation platform(libs.micrometer.bom)
- annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$jmhVersion"
+ annotationProcessor libs.jmh.generatorAnnprocess
 
  current project(':reactor-core')
  current project(':reactor-core-micrometer')

build.gradle

@@ -41,7 +41,6 @@ plugins {
 
 apply plugin: "io.reactor.gradle.detect-ci"
 apply from: "gradle/releaser.gradle"
-apply from: "gradle/dependencies.gradle"
 
 repositories { //needed at root for asciidoctor and nohttp-checkstyle
 mavenCentral()

buildSrc/build.gradle

@@ -23,13 +23,11 @@ repositories {
 gradlePluginPortal()
 }
 
-apply from: "../gradle/dependencies.gradle"
-
 dependencies {
-testImplementation "org.assertj:assertj-core:$assertjVersion"
-testImplementation platform("org.junit:junit-bom:$junitVersion")
-testImplementation "org.junit.jupiter:junit-jupiter-api"
-testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+testImplementation libs.assertJ
+testImplementation platform(libs.junit.bom)
+testImplementation libs.junit.jupiterApi
+testRuntimeOnly libs.junit.jupiterEngine
 }
 
 test {

gradle/dependencies.gradle

@@ -18,7 +18,6 @@ micrometer = "1.14.8"
 micrometerDocsGenerator = "1.0.4"
 micrometerTracingTest="1.4.7"
 contextPropagation="1.1.3"
-kotlin = "1.8.22"
 reactiveStreams = "1.0.4"
 antora = "1.0.0"
 antora-yml = "0.0.1"
@@ -29,6 +28,20 @@ antora-collector-extension = "1.0.0-alpha.3"
 antora-tabs-extension = "1.0.0-beta.6"
 antora-springio-antora-extension = "1.14.4"
 antora-asciidoctor-extension = "1.0.0-alpha.10"
+archUnit = "0.23.1"
+assertJ = "3.27.3"
+awaitility = "4.3.0"
+blockhound = "1.0.13.RELEASE"
+byteBuddy = "1.17.6"
+cglib = "3.3.0"
+javaObjectLayout = "0.17"
+jmh = "1.37"
+junit = "5.13.2"
+logback = "1.2.13"
+mockito = "4.11.0"
+slf4j = "1.7.36"
+testng = "7.5.1" # since 7.6 JDK8 is unsupported, don't bump
+throwingFunction = "1.6.1"
 
 [libraries]
 jsr166backport = "io.projectreactor:jsr166:1.0.0.RELEASE"
@@ -43,12 +56,31 @@ micrometer-docsGenerator = { module = "io.micrometer:micrometer-docs-generator",
 micrometer-observation-test = { module = "io.micrometer:micrometer-observation-test" }
 micrometer-tracing-test = { module = "io.micrometer:micrometer-tracing-integration-test", version.ref = "micrometerTracingTest" }
 micrometer-test = { module = "io.micrometer:micrometer-test" }
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 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-coreMicrometer = { module = "io.projectreactor:reactor-core-micrometer", version.ref = "baselinePerfCoreMicrometer" }
 reactor-perfBaseline-extra = { module = "io.projectreactor.addons:reactor-extra", version.ref = "baselinePerfExtra" }
+archUnit = { module = "com.tngtech.archunit:archunit", version.ref = "archUnit" }
+assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
+awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
+blockhound = { module = "io.projectreactor.tools:blockhound", version.ref = "blockhound" }
+byteBuddy-core = { module = "net.bytebuddy:byte-buddy", version.ref = "byteBuddy" }
+byteBuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "byteBuddy" }
+cglib = { module = "cglib:cglib", version.ref = "cglib" }
+javaObjectLayout = { module = "org.openjdk.jol:jol-core", version.ref = "javaObjectLayout" }
+jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
+jmh-generatorAnnprocess = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-jupiterApi = { module = "org.junit.jupiter:junit-jupiter-api" }
+junit-jupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-jupiterLauncher = { module = "org.junit.platform:junit-platform-launcher" }
+junit-jupiterParams = { module = "org.junit.jupiter:junit-jupiter-params" }
+logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
+mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+testng = { module = "org.testng:testng", version.ref = "testng" }
+throwingFunction = { module = "com.pivovarit:throwing-function", version.ref = "throwingFunction" }
 
 [plugins]
 artifactory = { id = "com.jfrog.artifactory", version = "4.33.1" }

gradle/libs.versions.toml

@@ -47,11 +47,11 @@ dependencies {
 implementation platform(libs.micrometer.bom)
 api libs.micrometer.core
 
-testImplementation platform("org.junit:junit-bom:$junitVersion")
-testImplementation "org.junit.jupiter:junit-jupiter-api"
-testImplementation "org.junit.platform:junit-platform-launcher"
-testImplementation "org.junit.jupiter:junit-jupiter-params"
-testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+testImplementation platform(libs.junit.bom)
+testImplementation libs.junit.jupiterApi
+testImplementation libs.junit.jupiterLauncher
+testImplementation libs.junit.jupiterParams
+testRuntimeOnly libs.junit.jupiterEngine
 
 testImplementation platform(libs.micrometer.bom)
 testImplementation (libs.micrometer.core) {
@@ -77,10 +77,10 @@ dependencies {
 // Needs sourceSets.test.output because tests there use helpers like AutoDisposingRule etc.
 testImplementation project(":reactor-core").sourceSets.test.output
 
-testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion" //need to access API to decrease some tests verbosity
-testImplementation "org.assertj:assertj-core:$assertjVersion"
-testImplementation "org.mockito:mockito-core:$mockitoVersion"
-testImplementation "org.awaitility:awaitility:$awaitilityVersion"
+testRuntimeOnly libs.logback //need to access API to decrease some tests verbosity
+testImplementation libs.assertJ
+testImplementation libs.mockito
+testImplementation libs.awaitility
 }
 
 tasks.withType(Test).all {

reactor-core-micrometer/build.gradle

@@ -124,15 +124,15 @@ dependencies {
 */
 exclude group: 'junit', module: 'junit'
 }
-tckTestImplementation "org.testng:testng:$testngVersion"
+tckTestImplementation libs.testng
 
 // JSR-305 annotations
 compileOnly libs.jsr305
 testCompileOnly libs.jsr305
 
 // Optional Logging Operator
-compileOnly "org.slf4j:slf4j-api:$slf4jVersion"
-testCompileOnly "org.slf4j:slf4j-api:$slf4jVersion"
+compileOnly libs.slf4j
+testCompileOnly libs.slf4j
 
 // Optional Metrics
 compileOnly platform(libs.micrometer.bom)
@@ -143,29 +143,29 @@ dependencies {
 compileOnly libs.micrometer.contextPropagation
 
 // Optional BlockHound support
-compileOnly "io.projectreactor.tools:blockhound:$blockhoundVersion"
+compileOnly libs.blockhound
 // Also make BlockHound visible in the CP of dedicated testset
-blockHoundTestImplementation "io.projectreactor.tools:blockhound:$blockhoundVersion"
+blockHoundTestImplementation libs.blockhound
 
 // Optional JDK 9 Converter
 jsr166backport libs.jsr166backport
 
 // Testing
-testImplementation platform("org.junit:junit-bom:$junitVersion")
-testImplementation "org.junit.jupiter:junit-jupiter-api"
-testImplementation "org.junit.platform:junit-platform-launcher"
-testImplementation "org.junit.jupiter:junit-jupiter-params"
-testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+testImplementation platform(libs.junit.bom)
+testImplementation libs.junit.jupiterApi
+testImplementation libs.junit.jupiterLauncher
+testImplementation libs.junit.jupiterParams
+testRuntimeOnly libs.junit.jupiterEngine
 testImplementation(project(":reactor-test")) {
 exclude module: 'reactor-core'
 }
-testImplementation "ch.qos.logback:logback-classic:$logbackVersion" //need to access API to decrease some tests verbosity
-testImplementation "org.assertj:assertj-core:$assertjVersion"
-testImplementation "org.mockito:mockito-core:$mockitoVersion"
-testImplementation "org.openjdk.jol:jol-core:$javaObjectLayoutVersion"
-testImplementation "org.awaitility:awaitility:$awaitilityVersion"
-testImplementation "com.pivovarit:throwing-function:$throwingFunctionVersion"
-testImplementation "com.tngtech.archunit:archunit:$archUnitVersion"
+testImplementation libs.logback //need to access API to decrease some tests verbosity
+testImplementation libs.assertJ
+testImplementation libs.mockito
+testImplementation libs.javaObjectLayout
+testImplementation libs.awaitility
+testImplementation libs.throwingFunction
+testImplementation libs.archUnit
 
 // withMicrometerTest is a test-set that validates what happens when micrometer *IS*
 // on the classpath. Needs sourceSets.test.output because tests there use helpers like AutoDisposingRule etc.
@@ -184,7 +184,7 @@ dependencies {
 jcstressImplementation(project(":reactor-test")) {
 exclude module: 'reactor-core'
 }
-jcstressImplementation "ch.qos.logback:logback-classic:$logbackVersion"
+jcstressImplementation libs.logback
 
 }
 

reactor-core/build.gradle

@@ -40,15 +40,15 @@ dependencies {
 api project(":reactor-core")
 compileOnly libs.jsr305
 
-testImplementation platform("org.junit:junit-bom:$junitVersion")
-testImplementation "org.junit.jupiter:junit-jupiter-api"
-testImplementation "org.junit.jupiter:junit-jupiter-params"
-testRuntimeOnly "org.junit.platform:junit-platform-launcher"
-testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
-
-testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
-testImplementation "org.assertj:assertj-core:$assertjVersion"
-testImplementation "org.mockito:mockito-core:$mockitoVersion"
+testImplementation platform(libs.junit.bom)
+testImplementation libs.junit.jupiterApi
+testImplementation libs.junit.jupiterParams
+testImplementation libs.junit.jupiterLauncher
+testRuntimeOnly libs.junit.jupiterEngine
+
+testRuntimeOnly libs.logback
+testImplementation libs.assertJ
+testImplementation libs.mockito
 }
 
 task downloadBaseline(type: Download) {

reactor-test/build.gradle

@@ -68,27 +68,27 @@ dependencies {
  compileOnly libs.jsr305
  compileOnly libs.jsr305
 
- shaded "net.bytebuddy:byte-buddy:$byteBuddyVersion"
- shaded "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion"
+ shaded libs.byteBuddy.core
+ shaded libs.byteBuddy.agent
  for (dependency in project.configurations.shaded.dependencies) {
  compileOnly(dependency)
  testRuntimeOnly(dependency)
  javaAgentTestRuntimeOnly(dependency)
  }
 
- testImplementation platform("org.junit:junit-bom:$junitVersion")
- testImplementation "org.junit.jupiter:junit-jupiter-api"
- testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+ testImplementation platform(libs.junit.bom)
+ testImplementation libs.junit.jupiterApi
+ testRuntimeOnly libs.junit.jupiterEngine
 
- testImplementation "org.assertj:assertj-core:$assertjVersion"
- testImplementation "cglib:cglib:$cglibVersion"
+ testImplementation libs.assertJ
+ testImplementation libs.cglib
 
- jarFileTestImplementation "org.assertj:assertj-core:$assertjVersion"
+ jarFileTestImplementation libs.assertJ
 
  buildPluginTestImplementation gradleTestKit()
- buildPluginTestImplementation platform("org.junit:junit-bom:$junitVersion")
- buildPluginTestImplementation "org.junit.jupiter:junit-jupiter-api"
- buildPluginTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+ buildPluginTestImplementation platform(libs.junit.bom)
+ buildPluginTestImplementation libs.junit.jupiterApi
+ buildPluginTestRuntimeOnly libs.junit.jupiterEngine
 }
 
 test {
@@ -205,8 +205,8 @@ task generateMockGradle(type: Copy) {
  CORE: coreJar,
  AGENT: agentJar,
  REACTIVE_STREAMS_VERSION: libs.versions.reactiveStreams.get(),
- JUNIT_BOM_VERSION: "$junitVersion".toString(),
- BYTE_BUDDY_VERSION: "$byteBuddyVersion".toString()
+ JUNIT_BOM_VERSION: libs.versions.junit.get(),
+ BYTE_BUDDY_VERSION: libs.versions.byteBuddy.get()
  ])
 }