From cbf6abf58b94debfc9b19f5a62a9229c89a96392 Mon Sep 17 00:00:00 2001
From: Alexander Dinauer <alexander.dinauer@sentry.io>
Date: Thu, 13 Oct 2022 12:57:01 +0200
Subject: [PATCH] Use Java 17 on CI

---
 .github/workflows/build.yml                        |  5 ++---
 .github/workflows/format-code.yml                  |  6 +++---
 .github/workflows/generate-javadocs.yml            |  6 +++---
 .github/workflows/integration-tests-benchmarks.yml | 12 ++++++------
 .github/workflows/integration-tests-ui.yml         |  6 +++---
 CHANGELOG.md                                       |  1 +
 gradle.properties                                  |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69ebd8f7d2..aaa3ee3315 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,8 +16,7 @@ jobs:
       matrix:
         # TODO: windows-latest
         os: [ubuntu-latest, macos-latest]
-        # Zulu Community distribution of OpenJDK
-        java: ['11']
+        java: ['17']
 
     steps:
       - name: Git checkout
@@ -27,7 +26,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
index a6e40c7112..b561beb78b 100644
--- a/.github/workflows/format-code.yml
+++ b/.github/workflows/format-code.yml
@@ -10,11 +10,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml
index 1789bbaf5c..56fa7d2d78 100644
--- a/.github/workflows/generate-javadocs.yml
+++ b/.github/workflows/generate-javadocs.yml
@@ -10,11 +10,11 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
diff --git a/.github/workflows/integration-tests-benchmarks.yml b/.github/workflows/integration-tests-benchmarks.yml
index dcd9fcf526..4405ca9997 100644
--- a/.github/workflows/integration-tests-benchmarks.yml
+++ b/.github/workflows/integration-tests-benchmarks.yml
@@ -20,11 +20,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v2
 
-      - name: 'Set up Java: 11'
+      - name: 'Set up Java: 17'
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
 
       # Clean, build and release a test apk
       - name: Make assembleBenchmarks
@@ -57,11 +57,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v2
 
-      - name: 'Set up Java: 11'
+      - name: 'Set up Java: 17'
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
 
       - uses: actions/cache@v3
         id: app-plain-cache
diff --git a/.github/workflows/integration-tests-ui.yml b/.github/workflows/integration-tests-ui.yml
index 6a96cba591..ca68f0e676 100644
--- a/.github/workflows/integration-tests-ui.yml
+++ b/.github/workflows/integration-tests-ui.yml
@@ -15,11 +15,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v2
 
-      - name: 'Set up Java: 11'
+      - name: 'Set up Java: 17'
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
 
       # Clean, build and release a test apk
       - name: Make assembleUiTests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67a1a2cca8..1501e9c1f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 - Remove verbose FrameMetricsAggregator failure logging ([#2293](https://github.com/getsentry/sentry-java/pull/2293))
+- Support newer versions of Spring and Spring Boot ([#2289](https://github.com/getsentry/sentry-java/pull/2289))
 
 ## 6.5.0
 
diff --git a/gradle.properties b/gradle.properties
index f621a084a6..72df769b36 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Daemon’s heap size
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
 
 org.gradle.parallel=true