From 06577f129d6441861981b7a292a8a3dbfda892d8 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 1 Jul 2018 15:33:12 +0300
Subject: [PATCH] update to spring 5

---
 spring-mvc-forms-jsp/pom.xml                  | 24 ++++++-------------
 .../ApplicationConfiguration.java             |  5 ++--
 .../baeldung/springmvcforms/domain/User.java  |  5 ++--
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/spring-mvc-forms-jsp/pom.xml b/spring-mvc-forms-jsp/pom.xml
index 359e186f52..3c18403c71 100644
--- a/spring-mvc-forms-jsp/pom.xml
+++ b/spring-mvc-forms-jsp/pom.xml
@@ -13,15 +13,16 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${springframework.version}</version>
+            <version>${spring.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
@@ -65,11 +66,10 @@
             <artifactId>commons-fileupload</artifactId>
             <version>${fileupload.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson-databind.version}</version>
         </dependency>
 
 
@@ -104,24 +104,14 @@
         </profile>
     </profiles>
 
-    <repositories>
-        <repository>
-            <id>1</id>
-            <name>jstl</name>
-            <url>https://mvnrepository.com/artifact/javax.servlet/jstl</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <springframework.version>4.3.7.RELEASE</springframework.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <jstl.version>1.2</jstl.version>
         <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <hibernate-validator.version>5.4.0.Final</hibernate-validator.version>
+        <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
         <deploy-path>server default deploy directory</deploy-path>
-        <fileupload.version>1.3.2</fileupload.version>
-        <jackson.version>2.8.7</jackson.version><!-- persistence -->
+        <fileupload.version>1.3.3</fileupload.version>
         <hibernate.version>5.2.5.Final</hibernate.version>
         <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
     </properties>
diff --git a/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java
index 93fab9caf8..b8b36df84e 100644
--- a/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java
+++ b/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java
@@ -8,14 +8,13 @@ import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @EnableWebMvc
 @ComponentScan(basePackages = {"com.baeldung.springmvcforms", "com.baeldung.jstl"})
-class ApplicationConfiguration extends WebMvcConfigurerAdapter {
+class ApplicationConfiguration implements WebMvcConfigurer {
 
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/domain/User.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/domain/User.java
index 49f006f422..9e0e7c99be 100644
--- a/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/domain/User.java
+++ b/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/domain/User.java
@@ -1,13 +1,12 @@
 package com.baeldung.springmvcforms.domain;
 
 import javax.validation.constraints.Digits;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
-import org.hibernate.validator.constraints.Email;
-import org.hibernate.validator.constraints.NotBlank;
-
 public class User {
 
     @NotNull