From 275355296823b831c6c96818c2758bfa0724d4f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 12:14:07 +0000 Subject: [PATCH] build(deps): bump the java-other group across 1 directory with 6 updates Bumps the java-other group with 6 updates in the /java directory: | Package | From | To | | --- | --- | --- | | com.diffplug.spotless | `8.6.0` | `8.8.0` | | [com.gradleup.shadow](https://github.com/GradleUp/shadow) | `9.4.2` | `9.5.1` | | [org.apache.logging.log4j:log4j-bom](https://github.com/apache/logging-log4j2) | `2.26.0` | `2.26.1` | | software.amazon.awssdk:bom | `2.46.0` | `2.46.21` | | [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) | `5.3.2` | `5.4.0` | | [gradle-wrapper](https://github.com/gradle/gradle) | `9.5.1` | `9.6.1` | Updates `com.diffplug.spotless` from 8.6.0 to 8.8.0 Updates `com.gradleup.shadow` from 9.4.2 to 9.5.1 - [Release notes](https://github.com/GradleUp/shadow/releases) - [Commits](https://github.com/GradleUp/shadow/compare/9.4.2...9.5.1) Updates `org.apache.logging.log4j:log4j-bom` from 2.26.0 to 2.26.1 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/2.x/RELEASE-NOTES.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.26.0...rel/2.26.1) Updates `software.amazon.awssdk:bom` from 2.46.0 to 2.46.21 Updates `com.squareup.okhttp3:okhttp` from 5.3.2 to 5.4.0 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-5.3.2...parent-5.4.0) Updates `gradle-wrapper` from 9.5.1 to 9.6.1 - [Release notes](https://github.com/gradle/gradle/releases) - [Commits](https://github.com/gradle/gradle/compare/v9.5.1...v9.6.1) --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-version: 8.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-other - dependency-name: com.gradleup.shadow dependency-version: 9.5.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-other - dependency-name: org.apache.logging.log4j:log4j-bom dependency-version: 2.26.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-other - dependency-name: software.amazon.awssdk:bom dependency-version: 2.46.21 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-other - dependency-name: com.squareup.okhttp3:okhttp dependency-version: 5.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-other - dependency-name: gradle-wrapper dependency-version: 9.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-other ... Signed-off-by: dependabot[bot] --- 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 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts index 9df67c4f1a..3935ceb37c 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.46.21" ) 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" } }