diff --git a/disk-buffering/build.gradle.kts b/disk-buffering/build.gradle.kts index 8250c1bdf..715b85c56 100644 --- a/disk-buffering/build.gradle.kts +++ b/disk-buffering/build.gradle.kts @@ -4,7 +4,7 @@ import ru.vyarus.gradle.plugin.animalsniffer.AnimalSniffer plugins { id("otel.java-conventions") id("otel.publish-conventions") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") id("me.champeau.jmh") version "0.7.3" id("ru.vyarus.animalsniffer") version "2.0.1" id("com.squareup.wire") version "5.3.5" diff --git a/gcp-auth-extension/build.gradle.kts b/gcp-auth-extension/build.gradle.kts index fd95a653f..f81e5e521 100644 --- a/gcp-auth-extension/build.gradle.kts +++ b/gcp-auth-extension/build.gradle.kts @@ -1,8 +1,7 @@ plugins { id("otel.java-conventions") id("otel.publish-conventions") - id("com.github.johnrengelman.shadow") - id("org.springframework.boot") version "2.7.18" + id("com.gradleup.shadow") } description = "OpenTelemetry extension that provides GCP authentication support for OTLP exporters" @@ -14,6 +13,8 @@ val agent: Configuration by configurations.creating { } dependencies { + implementation(platform("org.springframework.boot:spring-boot-dependencies:2.7.18")) + annotationProcessor("com.google.auto.service:auto-service") // We use `compileOnly` dependency because during runtime all necessary classes are provided by // javaagent itself. @@ -88,11 +89,6 @@ tasks { assemble { dependsOn(shadowJar) } - - bootJar { - // disable bootJar in build since it only runs as part of test - enabled = false - } } val builtLibsDir = layout.buildDirectory.dir("libs").get().asFile.absolutePath diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55ba..8bdaf60c7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78cb6e16a..3e781fbad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a936..ef07e0162 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/jmx-metrics/build.gradle.kts b/jmx-metrics/build.gradle.kts index 77ff2c243..b254fc1d8 100644 --- a/jmx-metrics/build.gradle.kts +++ b/jmx-metrics/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("otel.java-conventions") application - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") id("otel.groovy-conventions") id("otel.publish-conventions") diff --git a/jmx-scraper/build.gradle.kts b/jmx-scraper/build.gradle.kts index d58fa6490..9ef9a7277 100644 --- a/jmx-scraper/build.gradle.kts +++ b/jmx-scraper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { application - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") id("otel.java-conventions") diff --git a/maven-extension/build.gradle.kts b/maven-extension/build.gradle.kts index a2972d0ea..15755f0ce 100644 --- a/maven-extension/build.gradle.kts +++ b/maven-extension/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") id("otel.java-conventions") id("otel.publish-conventions") } diff --git a/settings.gradle.kts b/settings.gradle.kts index bc4b5a1de..ed7366ed7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "9.0.0-rc3" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("com.gradle.develocity") version "4.1" }