Merge branch 'master' into tkdodo/ref/compactSelect-onClear

Author: TkDodo

static/app/gettingStartedDocs/java-spring/onboarding.tsx

@@ -67,7 +67,11 @@ JAVA_OPTS="$\{JAVA_OPTS} -javaagent:/somewhere/sentry-opentelemetry-agent-${getP
 
 const getJavaConfigSnippet = (params: Params) => `
 import io.sentry.spring${
-  params.platformOptions.springVersion === SpringVersion.V6 ? '.jakarta' : ''
+  params.platformOptions.springVersion === SpringVersion.V6
+    ? '.jakarta'
+    : params.platformOptions.springVersion === SpringVersion.V7
+      ? '7'
+      : ''
 }.EnableSentry;
 
 @EnableSentry(
@@ -82,7 +86,11 @@ class SentryConfiguration {
 
 const getKotlinConfigSnippet = (params: Params) => `
 import io.sentry.spring${
-  params.platformOptions.springVersion === SpringVersion.V6 ? '.jakarta' : ''
+  params.platformOptions.springVersion === SpringVersion.V6
+    ? '.jakarta'
+    : params.platformOptions.springVersion === SpringVersion.V7
+      ? '7'
+      : ''
 }.EnableSentry
 import org.springframework.core.Ordered
 
@@ -259,7 +267,9 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
                   <code>
                     {params.platformOptions.springVersion === SpringVersion.V5
                       ? 'sentry-spring'
-                      : 'sentry-spring-jakarta'}
+                      : params.platformOptions.springVersion === SpringVersion.V6
+                        ? 'sentry-spring-jakarta'
+                        : 'sentry-spring-7'}
                   </code>
                 ),
                 codeEnableSentry: <code />,

static/app/gettingStartedDocs/java-spring/utils.tsx

@@ -8,12 +8,17 @@ import {t} from 'sentry/locale';
 export enum SpringVersion {
   V5 = 'v5',
   V6 = 'v6',
+  V7 = 'v7',
 }
 
 export const platformOptions = {
   springVersion: {
     label: t('Spring Version'),
     items: [
+      {
+        label: t('Spring 7'),
+        value: SpringVersion.V7,
+      },
       {
         label: t('Spring 6'),
         value: SpringVersion.V6,