diff --git a/samples/durable-task-sdks/java/async-http-api/build.gradle b/samples/durable-task-sdks/java/async-http-api/build.gradle index e3d738c3..69aeb517 100644 --- a/samples/durable-task-sdks/java/async-http-api/build.gradle +++ b/samples/durable-task-sdks/java/async-http-api/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download diff --git a/samples/durable-task-sdks/java/entities/build.gradle b/samples/durable-task-sdks/java/entities/build.gradle index 9e42cc56..01126d30 100644 --- a/samples/durable-task-sdks/java/entities/build.gradle +++ b/samples/durable-task-sdks/java/entities/build.gradle @@ -10,7 +10,7 @@ java { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } -def grpcVersion = '1.80.0' +def grpcVersion = '1.81.0' base { archivesName = 'durabletask-samples' } repositories { @@ -29,12 +29,12 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' - implementation 'org.slf4j:slf4j-api:2.0.17' + implementation 'ch.qos.logback:logback-classic:1.5.34' + implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-stub:${grpcVersion}" runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" - implementation 'com.azure:azure-identity:1.18.2' + implementation 'com.azure:azure-identity:1.18.3' } diff --git a/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.jar b/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.jar index d997cfc6..b1b8ef56 100644 Binary files a/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.jar and b/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.properties b/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.properties index 3499ded5..4dcb8425 100644 --- a/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.properties +++ b/samples/durable-task-sdks/java/entities/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/durable-task-sdks/java/entities/gradlew b/samples/durable-task-sdks/java/entities/gradlew old mode 100644 new mode 100755 index 0262dcbd..b9bb139f --- a/samples/durable-task-sdks/java/entities/gradlew +++ b/samples/durable-task-sdks/java/entities/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/samples/durable-task-sdks/java/entities/gradlew.bat b/samples/durable-task-sdks/java/entities/gradlew.bat index c4bdd3ab..aa5f10b0 100644 --- a/samples/durable-task-sdks/java/entities/gradlew.bat +++ b/samples/durable-task-sdks/java/entities/gradlew.bat @@ -1,93 +1,82 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +@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 + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/samples/durable-task-sdks/java/eternal-orchestrations/build.gradle b/samples/durable-task-sdks/java/eternal-orchestrations/build.gradle index f83d9d50..8db8368f 100644 --- a/samples/durable-task-sdks/java/eternal-orchestrations/build.gradle +++ b/samples/durable-task-sdks/java/eternal-orchestrations/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download diff --git a/samples/durable-task-sdks/java/fan-out-fan-in/build.gradle b/samples/durable-task-sdks/java/fan-out-fan-in/build.gradle index 2fed1708..5436795e 100644 --- a/samples/durable-task-sdks/java/fan-out-fan-in/build.gradle +++ b/samples/durable-task-sdks/java/fan-out-fan-in/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download diff --git a/samples/durable-task-sdks/java/function-chaining/build.gradle b/samples/durable-task-sdks/java/function-chaining/build.gradle index d607c801..e0accc8a 100644 --- a/samples/durable-task-sdks/java/function-chaining/build.gradle +++ b/samples/durable-task-sdks/java/function-chaining/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download diff --git a/samples/durable-task-sdks/java/human-interaction/build.gradle b/samples/durable-task-sdks/java/human-interaction/build.gradle index 1029ca0d..a7d9717b 100644 --- a/samples/durable-task-sdks/java/human-interaction/build.gradle +++ b/samples/durable-task-sdks/java/human-interaction/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download diff --git a/samples/durable-task-sdks/java/monitoring/build.gradle b/samples/durable-task-sdks/java/monitoring/build.gradle index 1a1a21c2..1ea82b70 100644 --- a/samples/durable-task-sdks/java/monitoring/build.gradle +++ b/samples/durable-task-sdks/java/monitoring/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download diff --git a/samples/durable-task-sdks/java/opentelemetry-tracing/build.gradle b/samples/durable-task-sdks/java/opentelemetry-tracing/build.gradle index 59cd9686..0e293bb4 100644 --- a/samples/durable-task-sdks/java/opentelemetry-tracing/build.gradle +++ b/samples/durable-task-sdks/java/opentelemetry-tracing/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // gRPC diff --git a/samples/durable-task-sdks/java/sub-orchestrations/build.gradle b/samples/durable-task-sdks/java/sub-orchestrations/build.gradle index af56c014..00370fb0 100644 --- a/samples/durable-task-sdks/java/sub-orchestrations/build.gradle +++ b/samples/durable-task-sdks/java/sub-orchestrations/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation("com.microsoft:durabletask-azuremanaged:1.9.0") // Logging dependencies - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' implementation 'org.slf4j:slf4j-api:2.0.18' // https://github.com/grpc/grpc-java#download