bump spring boot parent version to 3.1.5 for samples

Signed-off-by: liga-oz <[email protected]>
SAP · Nov 8, 2023 · 6082b64 · 6082b64
1 parent 836ac47
commit 6082b64
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 30 deletions.
diff --git a/samples/spring-security-basic-auth/pom.xml b/samples/spring-security-basic-auth/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.1.5</version>
 		<relativePath/>
 	</parent>
 

diff --git a/...g-security-basic-auth/src/main/java/sample/spring/xsuaa/config/SecurityConfiguration.java b/...g-security-basic-auth/src/main/java/sample/spring/xsuaa/config/SecurityConfiguration.java
@@ -36,21 +36,18 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 		authEntryPoint.setRealmName("spring-security-basic-auth");
 
 		// @formatter:off
-		http.authorizeHttpRequests()
-				.requestMatchers("/fetchToken").hasAuthority("Display")
-				.requestMatchers("/health").permitAll()
-				.anyRequest().denyAll()
-			.and()
-				.sessionManagement()
-				.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-			.and()
-				.exceptionHandling()
-				.authenticationEntryPoint(authEntryPoint)
-			.and()
-				.oauth2ResourceServer()
-				.bearerTokenResolver(tokenBrokerResolver)
-				.jwt()
-				.jwtAuthenticationConverter(authConverter);
+		http
+				.httpBasic(basic -> basic.authenticationEntryPoint(authEntryPoint))
+				.authorizeHttpRequests(authz ->
+						authz
+								.requestMatchers("/fetchToken").hasAuthority("Display")
+								.requestMatchers("/health").permitAll()
+								.anyRequest().denyAll())
+				.sessionManagement(session -> session
+						.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+				.oauth2ResourceServer(oauth2 -> oauth2
+						.bearerTokenResolver(tokenBrokerResolver)
+				.jwt(jwt -> jwt.jwtAuthenticationConverter(authConverter)));
 		// @formatter:on
 
 		return http.build();

diff --git a/samples/spring-security-hybrid-usage/pom.xml b/samples/spring-security-hybrid-usage/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.1.5</version>
 		<relativePath/>
 	</parent>
 

diff --git a/...ing-security-hybrid-usage/src/main/java/sample/spring/security/SecurityConfiguration.java b/...ing-security-hybrid-usage/src/main/java/sample/spring/security/SecurityConfiguration.java
@@ -41,17 +41,17 @@ public class SecurityConfiguration {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         // @formatter:off
-        http.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
+        http
+                .sessionManagement(session -> session
+                        .sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(authz ->
                         authz.requestMatchers("/sayHello").hasAuthority("Read")
                                 .requestMatchers("/comp/sayHello").hasAuthority("Read")
                                 .requestMatchers("/*").authenticated()
                                 .anyRequest().denyAll())
-                .oauth2ResourceServer()
-                .jwt()
-                .jwtAuthenticationConverter(new MyCustomHybridTokenAuthenticationConverter()); // Adjust the converter to represent your use case
+                .oauth2ResourceServer(oauth2 -> oauth2
+                        .jwt(jwt -> jwt
+                                .jwtAuthenticationConverter(new MyCustomHybridTokenAuthenticationConverter()))); // Adjust the converter to represent your use case
                                             // Use MyCustomHybridTokenAuthenticationConverter when IAS and XSUAA is used
                                             // Use MyCustomIasTokenAuthenticationConverter when only IAS is used
         // @formatter:on

diff --git a/samples/spring-security-xsuaa-usage/pom.xml b/samples/spring-security-xsuaa-usage/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.1.5</version>
 		<relativePath/>
 	</parent>
 

diff --git a/.../spring-security-xsuaa-usage/src/main/java/sample/spring/xsuaa/SecurityConfiguration.java b/.../spring-security-xsuaa-usage/src/main/java/sample/spring/xsuaa/SecurityConfiguration.java
@@ -31,9 +31,8 @@ public class SecurityConfiguration {
 	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-				.sessionManagement()
-				.sessionCreationPolicy(SessionCreationPolicy.STATELESS) // session is created by approuter
-				.and()
+				.sessionManagement(session -> session
+						.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
 				.authorizeHttpRequests(authz ->
 						authz.requestMatchers("/v1/sayHello").hasAuthority("Read")
 								.requestMatchers("/v1/*").authenticated()
@@ -43,9 +42,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 								.requestMatchers("/health").permitAll()
 								.anyRequest().denyAll()
 				)
-				.oauth2ResourceServer()
-				.jwt()
-				.jwtAuthenticationConverter(getJwtAuthenticationConverter());
+				.oauth2ResourceServer(oauth2 -> oauth2
+						.jwt(jwt -> jwt
+								.jwtAuthenticationConverter(getJwtAuthenticationConverter())));
 		// @formatter:on
 
 		return http.build();