Skip to content

Commit ee81c79

Browse files
rstoyanchevrstoyanchev
committed
Update booking-mvc dependency versions
1 parent 38f4ea3 commit ee81c79

File tree

3 files changed

+25
-29
lines changed

3 files changed

+25
-29
lines changed

‎booking-mvc/pom.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,18 @@
7272
<dependency>
7373
<groupId>org.thymeleaf</groupId>
7474
<artifactId>thymeleaf</artifactId>
75-
<version>3.1.0.RC2</version>
75+
<version>3.1.1.RELEASE</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.thymeleaf</groupId>
7979
<artifactId>thymeleaf-spring6</artifactId>
80-
<version>3.1.0.RC2</version>
80+
<version>3.1.1.RELEASE</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.thymeleaf.extras</groupId>
8484
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
85-
<version>3.1.0.RC2</version>
85+
<version>3.1.0.RELEASE</version>
8686
</dependency>
87-
<!--
88-
<dependency>
89-
<groupId>org.thymeleaf.extras</groupId>
90-
<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
91-
<version>2.1.2.RELEASE</version>
92-
</dependency>
93-
-->
9487
<!-- Database, JPA -->
9588
<dependency>
9689
<groupId>org.hsqldb</groupId>

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package org.springframework.webflow.samples.booking.config;
22

3+
import org.springframework.context.annotation.Bean;
34
import org.springframework.context.annotation.Configuration;
4-
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
55
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
66
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
7-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
7+
import org.springframework.security.core.userdetails.User;
8+
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
9+
import org.springframework.security.web.SecurityFilterChain;
810
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
911

1012
@Configuration
1113
@EnableWebSecurity
12-
public class SecurityConfig extends WebSecurityConfigurerAdapter {
14+
public class SecurityConfig {
1315

14-
@Override
15-
protected void configure(HttpSecurity http) throws Exception {
16+
@Bean
17+
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
1618
http
1719
.formLogin()
1820
.loginPage("/login")
@@ -23,15 +25,16 @@ protected void configure(HttpSecurity http) throws Exception {
2325
.logout()
2426
.logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET"))
2527
.logoutSuccessUrl("/logoutSuccess");
28+
return http.build();
2629
}
2730

28-
@Override
29-
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
30-
auth.inMemoryAuthentication()
31-
.withUser("keith").password("{MD5}417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
32-
.withUser("erwin").password("{MD5}12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
33-
.withUser("jeremy").password("{MD5}57c6cbff0d421449be820763f03139eb").roles("USER").and()
34-
.withUser("scott").password("{MD5}942f2339bf50796de535a384f0d1af3e").roles("USER");
31+
@Bean
32+
public InMemoryUserDetailsManager userDetailsService() {
33+
return new InMemoryUserDetailsManager(
34+
User.withUsername("keith").password("{MD5}417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").build(),
35+
User.withUsername("erwin").password("{MD5}12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").build(),
36+
User.withUsername("jeremy").password("{MD5}57c6cbff0d421449be820763f03139eb").roles("USER").build(),
37+
User.withUsername("scott").password("{MD5}942f2339bf50796de535a384f0d1af3e").roles("USER").build());
3538
}
3639

3740
}

‎pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<properties>
2121
<easymock.version>3.4</easymock.version>
2222
<hsqldb.version>2.5.1</hsqldb.version>
23-
<hibernate.version>5.6.10.Final</hibernate.version>
24-
<hibernate-validator.version>7.0.4.Final</hibernate-validator.version>
23+
<hibernate.version>5.6.15.Final</hibernate.version>
24+
<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
2525
<jaxb.version>2.2.3</jaxb.version>
2626
<jetty-maven-plugin.version>11.0.11</jetty-maven-plugin.version>
2727
<jsp-api.version>3.0.0</jsp-api.version>
@@ -31,8 +31,8 @@
3131
<mojarra.version>2.2.20</mojarra.version>
3232
<myfaces.version>2.3.8</myfaces.version>
3333
<primefaces.version>8.0</primefaces.version>
34-
<servlet.version>5.0.0</servlet.version>
35-
<webflow.version>3.0.0-M1</webflow.version>
34+
<servlet.version>6.0.0</servlet.version>
35+
<webflow.version>3.0.0-SNAPSHOT</webflow.version>
3636
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
3737
</properties>
3838

@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.springframework</groupId>
4343
<artifactId>spring-framework-bom</artifactId>
44-
<version>6.0.0-M5</version>
44+
<version>6.0.7</version>
4545
<type>pom</type>
4646
<scope>import</scope>
4747
</dependency>
@@ -50,12 +50,12 @@
5050
<artifactId>spring-security-bom</artifactId>
5151
<type>pom</type>
5252
<scope>import</scope>
53-
<version>6.0.0-M5</version>
53+
<version>6.0.2</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.slf4j</groupId>
5757
<artifactId>slf4j-api</artifactId>
58-
<version>1.7.30</version>
58+
<version>2.0.6</version>
5959
</dependency>
6060
</dependencies>
6161
</dependencyManagement>

0 commit comments

Comments
 (0)