All dependencies handing switched to dependencyResolutionManagement

benchmarks/agent-benchmark/build.gradle

@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id("me.champeau.jmh") version "0.6.8"
+  alias(libs.plugins.jmh)
 }
 
 description 'A JMH benchmark to assert the overhead imposed by various types of BTrace instrumentation.'
@@ -11,11 +11,10 @@ def javaHome = env['JAVA_HOME']
 dependencies {
   implementation project(path: ":btrace-dist", configuration: "shadow")
   implementation project(":btrace-compiler")
-  jmh project(":btrace-instr")
-  jmh project(":btrace-runtime")
-  jmh project(":btrace-statsd")
-  jmh("org.openjdk.jmh:jmh-core:1.36")
-  jmh("org.openjdk.jmh:jmh-generator-annprocess:1.36")
+  jmh tasks.getByPath(':btrace-dist:bootJar').outputs.getFiles()
+
+  jmh libs.jmh
+  jmh libs.jmh.annprocess
 }
 
 task btracec(type: JavaExec) {

benchmarks/runtime-benchmarks/build.gradle

@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id("me.champeau.jmh") version "0.6.8"
+  alias(libs.plugins.jmh)
 }
 
 description 'A JMH benchmark to assert the overhead imposed by various types of BTrace instrumentation.'
@@ -18,8 +18,8 @@ dependencies {
   jmh project(":btrace-instr")
   jmh project(":btrace-runtime")
   jmh project(":btrace-statsd")
-  jmh("org.openjdk.jmh:jmh-core:1.36")
-  jmh("org.openjdk.jmh:jmh-generator-annprocess:1.36")
+  jmh libs.jmh
+  jmh libs.jmh.annprocess
   compilerDeps project(path: ":btrace-dist", configuration: "shadow")
   compilerDeps project(":btrace-compiler")
 }

btrace-agent/build.gradle

@@ -1,8 +1,6 @@
 dependencies {
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
-
-    implementation(group: 'org.ow2.asm', name: 'asm', version: "${rootProject.asmVersion}")
+    implementation libs.slf4j
+    implementation libs.asm
 
     implementation files("${JAVA_8_HOME}/lib/tools.jar")
     implementation project(':btrace-core')

btrace-client/build.gradle

@@ -1,14 +1,12 @@
 plugins {
-    id 'net.nemerosa.versioning' version '2.15.1'
+    alias(libs.plugins.versioning)
 }
 
 dependencies {
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
-
-    implementation(group: 'org.ow2.asm', name: 'asm', version: "${rootProject.asmVersion}")
-    implementation(group: 'org.ow2.asm', name: 'asm-tree', version: "${rootProject.asmVersion}")
-    implementation(group: 'org.ow2.asm', name: 'asm-util', version: "${rootProject.asmVersion}")
+    implementation libs.slf4j
+    implementation libs.asm
+    implementation libs.asm.tree
+    implementation libs.asm.util
 
     implementation files("${JAVA_8_HOME}/lib/tools.jar")
 

btrace-compiler/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     // https://mvnrepository.com/artifact/org.ow2.asm/asm
-    implementation(group: 'org.ow2.asm', name: 'asm', version: "${rootProject.asmVersion}")
-    implementation(group: 'org.ow2.asm', name: 'asm-util', version: "${rootProject.asmVersion}")
+    implementation libs.asm
+    implementation libs.asm.util
 
     implementation files("${JAVA_8_HOME}/lib/tools.jar")
     implementation project(path: ':btrace-core')

btrace-core/build.gradle

@@ -1,22 +1,15 @@
 import org.apache.tools.ant.filters.*
 
 plugins {
-    id 'net.nemerosa.versioning' version '2.15.1'
+    alias(libs.plugins.versioning)
 }
 
 dependencies {
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
-
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
-    implementation(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36')
-
-    // https://mvnrepository.com/artifact/org.jctools/jctools-core
-    implementation(group: 'org.jctools', name: 'jctools-core', version: '4.0.1')
-
-    // https://mvnrepository.com/artifact/org.ow2.asm/asm
-    implementation(group: 'org.ow2.asm', name: 'asm', version: "${rootProject.asmVersion}")
-    implementation(group: 'org.ow2.asm', name: 'asm-util', version: "${rootProject.asmVersion}")
+    implementation libs.slf4j
+    implementation libs.slf4j.simple
+    implementation libs.jctools
+    implementation libs.asm
+    implementation libs.asm.util
 }
 
 compileJava {

btrace-dist/build.gradle

@@ -1,10 +1,10 @@
 plugins {
+    id 'java'
+    id 'signing'
     id 'maven-publish'
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "com.netflix.nebula.ospackage" version "11.0.0"
-    id "java"
-    id "io.sdkman.vendors" version "3.0.0"
-    id "signing"
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.ospackage)
+    alias(libs.plugins.sdkman.vendors)
 }
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

btrace-dtrace/build.gradle

@@ -2,8 +2,8 @@ import org.gradle.internal.os.OperatingSystem
 import org.gradle.internal.jvm.Jvm
 
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'java'
+    alias(libs.plugins.shadow)
 }
 
 def nativeHeadersDir = "${buildDir}/generated/native/include"

btrace-instr/build.gradle

@@ -1,33 +1,26 @@
 import java.nio.file.Files
 import java.nio.file.Paths
 
-apply plugin: 'java'
-
-buildscript {
-    dependencies {
-        classpath files('../btrace-compiler/build/classes/main/java')
-    }
+plugins {
+    id 'java'
 }
 
 dependencies {
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
-    implementation group: 'org.ow2.asm', name: 'asm', version: "${rootProject.asmVersion}"
-    implementation group: 'org.ow2.asm', name: 'asm-tree', version: "${rootProject.asmVersion}"
-    implementation group: 'com.google.auto.service', name: 'auto-service', version: '1.0.1'
-
+    implementation libs.slf4j
+    implementation libs.asm
+    implementation libs.asm.tree
+    implementation libs.autoService
+    implementation libs.jctools
     implementation project(':btrace-core')
     implementation project(':btrace-services-api')
     implementation project(':btrace-runtime')
     implementation project(':btrace-compiler')
     implementation project(':btrace-statsd')
 
-    // https://mvnrepository.com/artifact/org.jctools/jctools-core
-    implementation(group: 'org.jctools', name: 'jctools-core', version: '4.0.1')
-
+    testImplementation libs.asm.util
+    testImplementation libs.slf4j.simple
+    testImplementation libs.junit.jupiter
     testImplementation project(':btrace-client')
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.1")
-    testImplementation group: 'org.ow2.asm', name: 'asm-util', version: "${rootProject.asmVersion}"
 }
 
 compileTestJava {

btrace-ui/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'net.nemerosa.versioning' version '2.15.1'
+  alias(libs.plugins.versioning)
 }
 
 sourceCompatibility = '11'

build.gradle

@@ -1,10 +1,8 @@
 plugins {
     id "jacoco"
-    id "com.diffplug.spotless" version "6.13.0"
+    alias(libs.plugins.spotless)
 }
 
-project.ext.asmVersion = "9.4"
-
 repositories {
     mavenCentral()
 }

common.gradle

@@ -46,8 +46,7 @@ repositories {
 
 dependencies {
     // Adding dependencies here will add the dependencies to each subproject.
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+	testImplementation libs.junit.jupiter
 }
 
 String mavenArtifactId = name

integration-tests/build.gradle

@@ -11,14 +11,6 @@ sourceSets {
     }
 }
 
-dependencies {
-    testImplementation project(':btrace-instr')
-    testImplementation project(':btrace-dist')
-    testImplementation project(':btrace-client')
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.1")
-    testImplementation group: 'org.ow2.asm', name: 'asm-util', version: "${rootProject.asmVersion}"
-}
-
 compileJava11_dummyJava {
     sourceCompatibility = 8
     targetCompatibility = 8

settings.gradle

@@ -24,3 +24,49 @@ subDirs.each { File dir ->
     include "benchmarks:runtime-benchmarks"
 }
 
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            // Families...
+            version('asm', '9.4')
+            version('jmh', '1.36')
+            version('jmhGradlePlugin', '0.6.5')
+            version('slf4j', '1.7.36')
+            version('junit', '5.9.1')
+
+            // *** Gradle plugins ***
+            plugin ('spotless', 'com.diffplug.spotless').version('6.11.0')
+            plugin ('versioning', 'net.nemerosa.versioning').version('2.15.1')
+            plugin ('ospackage', 'com.netflix.nebula.ospackage').version('11.0.0')
+            plugin ('shadow', 'com.github.johnrengelman.shadow').version('7.1.2')
+            plugin ('sdkman-vendors', 'io.sdkman.vendors').version('3.0.0')
+
+            plugin ('jmh', 'me.champeau.jmh').versionRef('jmhGradlePlugin')
+
+            // *** Libraries ***
+
+            // https://mvnrepository.com/artifact/com.google.auto.service
+            library ('autoService', 'com.google.auto.service', 'auto-service').version('1.0.1')
+            // https://mvnrepository.com/artifact/org.jctools
+            library ('jctools', 'org.jctools', 'jctools-core').version('4.0.1')
+
+
+            // https://mvnrepository.com/artifact/org.slf4j
+            library ('slf4j',  'org.slf4j', 'slf4j-api').versionRef('slf4j')
+            library ('slf4j-simple',  'org.slf4j', 'slf4j-simple').versionRef('slf4j')
+
+            // https://mvnrepository.com/artifact/org.ow2.asm
+            library ('asm',  'org.ow2.asm', 'asm').versionRef('asm')
+            library ('asm-tree',  'org.ow2.asm', 'asm-tree').versionRef('asm')
+            library ('asm-util',  'org.ow2.asm', 'asm-util').versionRef('asm')
+
+            // https://mvnrepository.com/artifact/org.openjdk.jmh
+            library ('jmh', 'org.openjdk.jmh', 'jmh-core').versionRef('jmh')
+            library ('jmh-annprocess', 'org.openjdk.jmh', 'jmh-generator-annprocess').versionRef('jmh')
+
+            // https://mvnrepository.com/artifact/org.junit.jupiter
+            library ('junit', 'org.junit', 'junit-bom').versionRef('junit')
+            library ('junit-jupiter', 'org.junit.jupiter', 'junit-jupiter').versionRef('junit')
+        }
+    }
+}