Skip to content

update to spring 5 #4495

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

Merged
lor6 merged 1 commit into from
Jun 17, 2018
Merged

update to spring 5 #4495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions spring-security-mvc-custom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-spring-4</artifactId>
<artifactId>parent-spring-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-spring-4</relativePath>
<relativePath>../parent-spring-5</relativePath>
</parent>

<dependencies>
Expand Down Expand Up @@ -193,26 +193,26 @@

<properties>
<!-- Spring -->
<org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
<org.springframework.security.version>5.0.6.RELEASE</org.springframework.security.version>

<!-- persistence -->
<hibernate.version>5.2.5.Final</hibernate.version>
<mysql-connector-java.version>5.1.40</mysql-connector-java.version>

<!-- various -->
<hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
<hibernate-validator.version>5.4.1.Final</hibernate-validator.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<jstl.version>1.2</jstl.version>

<!-- util -->
<guava.version>19.0</guava.version>
<commons-lang3.version>3.5</commons-lang3.version>
<jackson-databind.version>2.9.1</jackson-databind.version>
<jackson-databind.version>2.9.4</jackson-databind.version>

<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.5</httpcore.version>

<rest-assured.version>2.9.0</rest-assured.version>
<rest-assured.version>3.0.7</rest-assured.version>

<!-- Maven plugins -->
<maven-war-plugin.version>2.6</maven-war-plugin.version>
Expand Down
6 changes: 2 additions & 4 deletions spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;

@EnableWebMvc
@Configuration
@ComponentScan("org.baeldung.web.controller")
public class MvcConfig extends WebMvcConfigurerAdapter {
public class MvcConfig implements WebMvcConfigurer {

public MvcConfig() {
super();
Expand All @@ -27,8 +27,6 @@ public MvcConfig() {

@Override
public void addViewControllers(final ViewControllerRegistry registry) {
super.addViewControllers(registry);

registry.addViewController("/anonymous.html");

registry.addViewController("/login.html");
Expand Down
2 changes: 2 additions & 0 deletions spring-security-mvc-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
@Configuration
@ImportResource({ "classpath:webSecurityConfig.xml" })
public class SecSecurityConfig {



public SecSecurityConfig() {
super();
Expand Down
3 changes: 2 additions & 1 deletion spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.baeldung.web.controller;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;

Expand All @@ -18,7 +19,7 @@
@RequestMapping(value = "/custom")
public class LoginController {

@Autowired
@Resource(name="authenticationManager")
private AuthenticationManager authManager;

public LoginController() {
Expand Down
10 changes: 5 additions & 5 deletions spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-4.2.xsd
http://www.springframework.org/schema/security/spring-security.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
http://www.springframework.org/schema/beans/spring-beans.xsd"
>

<http use-expressions="true">
Expand All @@ -24,11 +24,11 @@

<beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>

<authentication-manager>
<authentication-manager id="authenticationManager">
<authentication-provider>
<user-service>
<user name="user1" password="user1Pass" authorities="ROLE_USER"/>
<user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN"/>
<user name="user1" password="{noop}user1Pass" authorities="ROLE_USER" />
<user name="admin1" password="{noop}admin1Pass" authorities="ROLE_ADMIN"/>
</user-service>
</authentication-provider>
</authentication-manager>
Expand Down