Release branch for pre-releasing 6.7 (#2307)

Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Co-authored-by: Lukas Bloder <lukas.bloder@gmail.com>
Co-authored-by: getsentry-bot <bot@sentry.io>

Author: 4 people

.craft.yml

@@ -22,7 +22,9 @@ targets:
     sdks:
       maven:io.sentry:sentry:
       maven:io.sentry:sentry-spring:
+      maven:io.sentry:sentry-spring-jakarta:
       maven:io.sentry:sentry-spring-boot-starter:
+      maven:io.sentry:sentry-spring-boot-starter-jakarta:
       maven:io.sentry:sentry-servlet:
       maven:io.sentry:sentry-servlet-jakarta:
       maven:io.sentry:sentry-logback:

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -17,7 +17,9 @@ body:
         - sentry-servlet
         - sentry-servlet-jakarta
         - sentry-spring-boot-starter
+        - sentry-spring-boot-starter-jakarta
         - sentry-spring
+        - sentry-spring-jakarta
         - sentry-logback
         - sentry-log4j2
         - sentry-graphql

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         # TODO: windows-latest
         os: [ubuntu-latest, macos-latest]
         # Zulu Community distribution of OpenJDK
-        java: ['11']
+        java: ['17']
 
     steps:
       - name: Git checkout
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -50,7 +50,7 @@ jobs:
 
       - name: Archive packages
         # We need artifacts from only one the builds
-        if: runner.os == 'Linux' && matrix.java == '11'
+        if: runner.os == 'Linux' && matrix.java == '17'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ github.sha }}
@@ -61,7 +61,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         # We need coverage data from only one the builds
-        if: runner.os == 'Linux' && matrix.java == '11'
+        if: runner.os == 'Linux' && matrix.java == '17'
         uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # pin@v3
         with:
           name: sentry-java

.github/workflows/codeql-analysis.yml

@@ -23,6 +23,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: 'Set up Java: ${{ matrix.java }}'
+        uses: actions/setup-java@v2
+        with:
+          java-version: 17
+          distribution: 'temurin'
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

.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

.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

.github/workflows/integration-tests-benchmarks.yml

@@ -24,11 +24,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
@@ -66,11 +66,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

.github/workflows/integration-tests-ui.yml

@@ -19,11 +19,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

.gitignore

@@ -17,3 +17,5 @@ bin/
 distributions/
 /Sentry/A1F16C4F5D23B2A1D281EE471D6F836BDEA23CB4/
 *.vscode/
+sentry-spring-boot-starter-jakarta/src/main/resources/META-INF/spring.factories
+sentry-samples/sentry-samples-spring-boot-jakarta/spy.log

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Customizable fragment lifecycle breadcrumbs ([#2299](https://github.com/getsentry/sentry-java/pull/2299))
 - Provide hook for Jetpack Compose navigation instrumentation ([#2320](https://github.com/getsentry/sentry-java/pull/2320))
 - Populate `event.modules` with dependencies metadata ([#2324](https://github.com/getsentry/sentry-java/pull/2324))
+- Support Spring 6 and Spring Boot 3 ([#2289](https://github.com/getsentry/sentry-java/pull/2289))
 
 ### Dependencies