Merge branch '1.0.x' into 1.1.x

.github/dependabot.yml

@@ -5,19 +5,119 @@ 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
-    allow:
-      - dependency-name: "com.gradle*"
-    registries:
-      - gradle-plugin-portal
+    target-branch: "1.0.x"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "1.1.x"
     schedule:
       interval: "weekly"
-    open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "1.0.x" # oldest OSS supported branch
+    target-branch: "main"
     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: 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: 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

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

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'
 		}