From 49bb7934dc6376940a1cfd18b0bbb3376e95e944 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2026 01:18:18 +0000 Subject: [PATCH 1/3] build(deps): update java-other --- integration-tests/handlers/java/build.gradle.kts | 4 ++-- .../handlers/java/gradle/wrapper/gradle-wrapper.properties | 4 ++-- integration-tests/handlers/java/gradlew | 4 ++-- integration-tests/handlers/java/gradlew.bat | 4 ++-- java/dependencyManagement/build.gradle.kts | 6 +++--- java/gradle/wrapper/gradle-wrapper.properties | 4 ++-- java/gradlew | 4 ++-- java/gradlew.bat | 4 ++-- java/settings.gradle.kts | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/integration-tests/handlers/java/build.gradle.kts b/integration-tests/handlers/java/build.gradle.kts index cfc2235288..3742e412a6 100644 --- a/integration-tests/handlers/java/build.gradle.kts +++ b/integration-tests/handlers/java/build.gradle.kts @@ -1,6 +1,6 @@ plugins { java - id("com.gradleup.shadow") version "9.4.1" + id("com.gradleup.shadow") version "9.5.1" } repositories { @@ -14,7 +14,7 @@ java { } dependencies { - implementation(platform("software.amazon.awssdk:bom:2.44.0")) + implementation(platform("software.amazon.awssdk:bom:2.47.5")) implementation("software.amazon.awssdk:sts") implementation("com.amazonaws:aws-lambda-java-core:1.4.0") implementation("com.amazonaws:aws-lambda-java-events:3.16.1") diff --git a/integration-tests/handlers/java/gradle/wrapper/gradle-wrapper.properties b/integration-tests/handlers/java/gradle/wrapper/gradle-wrapper.properties index 4b271a6469..dbe66e1d66 100644 --- a/integration-tests/handlers/java/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/handlers/java/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/integration-tests/handlers/java/gradlew b/integration-tests/handlers/java/gradlew index b9bb139f79..249efbb032 100755 --- a/integration-tests/handlers/java/gradlew +++ b/integration-tests/handlers/java/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/integration-tests/handlers/java/gradlew.bat b/integration-tests/handlers/java/gradlew.bat index aa5f10b069..8508ef684d 100644 --- a/integration-tests/handlers/java/gradlew.bat +++ b/integration-tests/handlers/java/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts index 9df67c4f1a..5b9c16b5ef 100644 --- a/java/dependencyManagement/build.gradle.kts +++ b/java/dependencyManagement/build.gradle.kts @@ -10,14 +10,14 @@ data class DependencySet(val group: String, val version: String, val modules: Li val DEPENDENCY_BOMS = listOf( "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha", - "org.apache.logging.log4j:log4j-bom:2.26.0", - "software.amazon.awssdk:bom:2.46.0" + "org.apache.logging.log4j:log4j-bom:2.26.1", + "software.amazon.awssdk:bom:2.47.5" ) val DEPENDENCIES = listOf( "com.amazonaws:aws-lambda-java-core:1.4.0", "com.amazonaws:aws-lambda-java-events:3.16.1", - "com.squareup.okhttp3:okhttp:5.3.2", + "com.squareup.okhttp3:okhttp:5.4.0", "io.opentelemetry.javaagent:opentelemetry-javaagent:2.28.1", "io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0", "io.opentelemetry.contrib:opentelemetry-aws-resources:1.57.0-alpha", diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties index bd82f36bab..dbe66e1d66 100644 --- a/java/gradle/wrapper/gradle-wrapper.properties +++ b/java/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/java/gradlew b/java/gradlew index b9bb139f79..249efbb032 100755 --- a/java/gradlew +++ b/java/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/java/gradlew.bat b/java/gradlew.bat index aa5f10b069..8508ef684d 100644 --- a/java/gradlew.bat +++ b/java/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts index 3f87e0abd5..7af1749fbe 100644 --- a/java/settings.gradle.kts +++ b/java/settings.gradle.kts @@ -1,8 +1,8 @@ pluginManagement { plugins { - id("com.diffplug.spotless") version "8.6.0" + id("com.diffplug.spotless") version "8.8.0" id("com.github.ben-manes.versions") version "0.54.0" - id("com.gradleup.shadow") version "9.4.2" + id("com.gradleup.shadow") version "9.5.1" } } From 3dba7ad66c7c130b5d252b4fb6b7b0e454dcadfd Mon Sep 17 00:00:00 2001 From: wpessers Date: Sun, 12 Jul 2026 23:58:13 +0200 Subject: [PATCH 2/3] fix(java): use DependencyHandler extension instead of Project.project --- java/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/build.gradle.kts b/java/build.gradle.kts index 7693c66f43..60940e35a5 100644 --- a/java/build.gradle.kts +++ b/java/build.gradle.kts @@ -23,7 +23,7 @@ allprojects { afterEvaluate { configurations.configureEach { if (!isCanBeResolved && !isCanBeConsumed) { - add(name, enforcedPlatform(project(":dependencyManagement"))) + add(name, enforcedPlatform(this@dependencies.project(":dependencyManagement"))) } } } From d3d0308b640579e07f2a92653248a49ab8389f0f Mon Sep 17 00:00:00 2001 From: wpessers Date: Mon, 13 Jul 2026 00:23:19 +0200 Subject: [PATCH 3/3] fix(java): use explicit API instead of deprecated container delegates --- java/layer-javaagent/build.gradle.kts | 4 ++-- java/layer-wrapper/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/layer-javaagent/build.gradle.kts b/java/layer-javaagent/build.gradle.kts index edb557c84b..97ba1d6b9b 100644 --- a/java/layer-javaagent/build.gradle.kts +++ b/java/layer-javaagent/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` } -val agentClasspath by configurations.creating { +val agentClasspath = configurations.create("agentClasspath") { extendsFrom(configurations["implementation"]) isCanBeConsumed = false isCanBeResolved = true @@ -17,7 +17,7 @@ dependencies { } tasks { - val createLayer by registering(Zip::class) { + val createLayer = register("createLayer") { archiveFileName.set("opentelemetry-javaagent-layer.zip") destinationDirectory.set(file("$buildDir/distributions")) diff --git a/java/layer-wrapper/build.gradle.kts b/java/layer-wrapper/build.gradle.kts index 971207ed5e..9147e9582c 100644 --- a/java/layer-wrapper/build.gradle.kts +++ b/java/layer-wrapper/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { } tasks { - val createLayer by registering(Zip::class) { + val createLayer = register("createLayer") { archiveFileName.set("opentelemetry-javawrapper-layer.zip") destinationDirectory.set(file("$buildDir/distributions"))