Merge branch 'main' into feat/auto-add-otel-event-processor-for-spring-boot

Author: adinauer

CHANGELOG.md

@@ -11,6 +11,12 @@
 - Add logging for OpenTelemetry integration ([#2425](https://github.com/getsentry/sentry-java/pull/2425))
 - Auto add `OpenTelemetryLinkErrorEventProcessor` for Spring Boot ([#2429](https://github.com/getsentry/sentry-java/pull/2429))
 
+### Dependencies
+
+- Bump Gradle from v7.5.1 to v7.6.0 ([#2438](https://github.com/getsentry/sentry-java/pull/2438))
+  - [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v760)
+  - [diff](https://github.com/gradle/gradle/compare/v7.5.1...v7.6.0)
+
 ## 6.10.0
 
 ### Features

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/update-gradle.sh

@@ -3,6 +3,10 @@ set -euo pipefail
 
 cd $(dirname "$0")/../
 
+if [[ -n ${CI+x} ]]; then
+    export JAVA_HOME=$JAVA_HOME_17_X64
+fi
+
 case $1 in
 get-version)
     # `./gradlew` shows some info on the first run, breaking the parsing in the next step.