Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update booking-mvc dependency versions

Browse Source
This commit is contained in:
rstoyanchev
2023-03-28 16:12:35 +01:00
parent 38f4ea3146
commit ee81c79b5a
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
booking-mvc/pom.xml
View File

@@ -72,25 +72,18 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>3.1.0.RC2</version>
<version>3.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring6</artifactId>
<version>3.1.0.RC2</version>
<version>3.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
<version>3.1.0.RC2</version>
<version>3.1.0.RELEASE</version>
</dependency>
<!--
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
<version>2.1.2.RELEASE</version>
</dependency>
-->
<!-- Database, JPA -->
<dependency>
<groupId>org.hsqldb</groupId>

27
booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
View File

@@ -1,18 +1,20 @@
package org.springframework.webflow.samples.booking.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
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.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
@Configuration
@EnableWebSecurity
public class SecurityConfig extends WebSecurityConfigurerAdapter {
public class SecurityConfig {
@Override
protected void configure(HttpSecurity http) throws Exception {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http
.formLogin()
.loginPage("/login")
@@ -23,15 +25,16 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.logout()
.logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET"))
.logoutSuccessUrl("/logoutSuccess");
return http.build();
}
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication()
.withUser("keith").password("{MD5}417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
.withUser("erwin").password("{MD5}12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
.withUser("jeremy").password("{MD5}57c6cbff0d421449be820763f03139eb").roles("USER").and()
.withUser("scott").password("{MD5}942f2339bf50796de535a384f0d1af3e").roles("USER");
@Bean
public InMemoryUserDetailsManager userDetailsService() {
return new InMemoryUserDetailsManager(
User.withUsername("keith").password("{MD5}417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").build(),
User.withUsername("erwin").password("{MD5}12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").build(),
User.withUsername("jeremy").password("{MD5}57c6cbff0d421449be820763f03139eb").roles("USER").build(),
User.withUsername("scott").password("{MD5}942f2339bf50796de535a384f0d1af3e").roles("USER").build());
}
}

14
pom.xml
View File

@@ -20,8 +20,8 @@
<properties>
<easymock.version>3.4</easymock.version>
<hsqldb.version>2.5.1</hsqldb.version>
<hibernate.version>5.6.10.Final</hibernate.version>
<hibernate-validator.version>7.0.4.Final</hibernate-validator.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
<jaxb.version>2.2.3</jaxb.version>
<jetty-maven-plugin.version>11.0.11</jetty-maven-plugin.version>
<jsp-api.version>3.0.0</jsp-api.version>
@@ -31,8 +31,8 @@
<mojarra.version>2.2.20</mojarra.version>
<myfaces.version>2.3.8</myfaces.version>
<primefaces.version>8.0</primefaces.version>
<servlet.version>5.0.0</servlet.version>
<webflow.version>3.0.0-M1</webflow.version>
<servlet.version>6.0.0</servlet.version>
<webflow.version>3.0.0-SNAPSHOT</webflow.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
</properties>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.0.0-M5</version>
<version>6.0.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -50,12 +50,12 @@
<artifactId>spring-security-bom</artifactId>
<type>pom</type>
<scope>import</scope>
<version>6.0.0-M5</version>
<version>6.0.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
<version>2.0.6</version>
</dependency>
</dependencies>
</dependencyManagement>