Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump spring to 2.7.4 #2279

Merged
merged 8 commits into from
Oct 7, 2022
Merged

Bump spring to 2.7.4 #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb7c5e3
Bump spring to 2.7.4
adinauer Oct 6, 2022
c6ec2a0
Suppress deprecation warning
adinauer Oct 6, 2022
26b231e
Format code
getsentry-bot Oct 6, 2022
ed22ebf
Add changelog
adinauer Oct 6, 2022
da8b638
Add comment to explain what has been deprecated
adinauer Oct 6, 2022
a85f410
Merge branch 'main' into feat/bump-spring-version
adinauer Oct 6, 2022
7f96e7a
Fix
adinauer Oct 6, 2022
959b8f6
Merge branch 'main' into feat/bump-spring-version
adinauer Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions ...amples-spring-boot/src/main/java/io/sentry/samples/spring/boot/SecurityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions ...s/sentry-samples-spring/src/main/java/io/sentry/samples/spring/SecurityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
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;
Expand All @@ -15,7 +14,10 @@

@Configuration
@EnableWebSecurity
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
Expand Down