diff --git a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar and b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties
+++ b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-connect/HealthConnectSample/gradlew.bat b/health-connect/HealthConnectSample/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-connect/HealthConnectSample/gradlew.bat
+++ b/health-connect/HealthConnectSample/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar and b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties
+++ b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-platform-v1/HealthPlatformSample/gradlew.bat b/health-platform-v1/HealthPlatformSample/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-platform-v1/HealthPlatformSample/gradlew.bat
+++ b/health-platform-v1/HealthPlatformSample/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar and b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/ExerciseSample/gradlew.bat b/health-services/ExerciseSample/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/ExerciseSample/gradlew.bat
+++ b/health-services/ExerciseSample/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/ExerciseSampleCompose/gradlew.bat b/health-services/ExerciseSampleCompose/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/ExerciseSampleCompose/gradlew.bat
+++ b/health-services/ExerciseSampleCompose/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar and b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/MeasureData/gradlew.bat b/health-services/MeasureData/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/MeasureData/gradlew.bat
+++ b/health-services/MeasureData/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/MeasureDataCompose/gradlew.bat b/health-services/MeasureDataCompose/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/MeasureDataCompose/gradlew.bat
+++ b/health-services/MeasureDataCompose/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveData/gradlew.bat b/health-services/PassiveData/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/PassiveData/gradlew.bat
+++ b/health-services/PassiveData/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveDataCompose/gradlew.bat b/health-services/PassiveDataCompose/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/PassiveDataCompose/gradlew.bat
+++ b/health-services/PassiveDataCompose/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveGoals/gradlew.bat b/health-services/PassiveGoals/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/health-services/PassiveGoals/gradlew.bat
+++ b/health-services/PassiveGoals/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
diff --git a/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME