Merge a85f410 into 5bfc1ca

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features
 
 - Provide API for attaching custom measurements to transactions ([#2260](https://github.com/getsentry/sentry-java/pull/2260))
+- Bump spring to 2.7.4 ([#2279](https://github.com/getsentry/sentry-java/pull/2279))
 
 ## 6.5.0-beta.2
 

buildSrc/src/main/java/Config.kt

@@ -4,7 +4,7 @@ object Config {
     val kotlinVersion = "1.6.10"
     val kotlinStdLib = "stdlib-jdk8"
 
-    val springBootVersion = "2.6.8"
+    val springBootVersion = "2.7.4"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     val composeVersion = "1.1.1"

sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/SecurityConfiguration.java

@@ -4,7 +4,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -13,7 +12,10 @@
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @Configuration
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+@SuppressWarnings("deprecation") // WebSecurityConfigurerAdapter has been deprecated
+public class SecurityConfiguration
+    extends org.springframework.security.config.annotation.web.configuration
+        .WebSecurityConfigurerAdapter {
 
   // this API is meant to be consumed by non-browser clients thus the CSRF protection is not needed.
   @Override