diff --git a/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml b/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml
deleted file mode 100644
index cf944804db..0000000000
--- a/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"
-    xmlns:mvc="http://www.springframework.org/schema/mvc"
-    xsi:schemaLocation="
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-		http://www.springframework.org/schema/mvc 
-        http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd"
->
-    <http use-expressions="true">
-        <intercept-url pattern="/login*" access="permitAll"/>
-        <intercept-url pattern="/logout*" access="permitAll"/>
-        <intercept-url pattern="/home*" access="permitAll"/>
-        <intercept-url pattern="/files/**" access="permitAll"/>
-        <intercept-url pattern="/resources/**" access="permitAll"/>
-        <intercept-url pattern="/js/**" access="permitAll"/>
-        <intercept-url pattern="/other-files/**" access="permitAll"/>
-        <intercept-url pattern="/invalidSession*" access="isAnonymous()"/>
-        <intercept-url pattern="/**" access="isAuthenticated()"/>
-
-        <form-login login-page='/login.html' authentication-failure-url="/login.html?error=true" authentication-success-handler-ref="myAuthenticationSuccessHandler"
-            default-target-url="home.html"/>
-        <session-management invalid-session-url="/invalidSession.html" session-fixation-protection="none"/>
-        <logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" delete-cookies="JSESSIONID"/>
-
-    </http>
-
-    <!-- for XML static resource confguration- comment out for java based config -->
-    <!-- -<mvc:resources mapping="/resources/**" location="/resources/" /> -->
-
-    <beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
-    <authentication-manager>
-        <authentication-provider>
-            <user-service>
-                <user name="user1" password="user1Pass" authorities="ROLE_USER"/>
-                <user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN"/>
-            </user-service>
-        </authentication-provider>
-    </authentication-manager>
-</beans:beans>
\ No newline at end of file
diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml b/handling-spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml
deleted file mode 100644
index 94bd63e068..0000000000
--- a/handling-spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
-
-</beans>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 31bf977b95..f823acfa6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <module>guava-modules/guava-21</module>
         <module>guice</module>
         <module>disruptor</module>
-        <module>handling-spring-static-resources</module>
+        <module>spring-static-resources</module>
         <module>hazelcast</module>
         <module>hbase</module>
         <!--<module>hibernate5</module> -->
diff --git a/handling-spring-static-resources/README.md b/spring-static-resources/README.md
similarity index 100%
rename from handling-spring-static-resources/README.md
rename to spring-static-resources/README.md
diff --git a/handling-spring-static-resources/pom.xml b/spring-static-resources/pom.xml
similarity index 92%
rename from handling-spring-static-resources/pom.xml
rename to spring-static-resources/pom.xml
index 771b37fb52..a00d03d2a1 100644
--- a/handling-spring-static-resources/pom.xml
+++ b/spring-static-resources/pom.xml
@@ -10,9 +10,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>
@@ -174,7 +174,9 @@
                 </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-war-plugin</artifactId>
+               <groupId>org.apache.maven.plugins</groupId>
+  <artifactId>maven-war-plugin</artifactId>
+  <version>3.2.2</version>
                 <configuration>
                     <webResources>
                         <resource>
@@ -190,20 +192,20 @@
         <java-version>1.8</java-version>
 
         <!-- 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>
 
         <org.aspectj-version>1.8.9</org.aspectj-version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
 
         <!-- marshalling -->
-        <jackson.version>2.8.5</jackson.version>
+        <jackson.version>2.9.6</jackson.version>
 
         <!-- various 1.3.2 -->
-        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
-        <handlebars.version>4.0.6</handlebars.version>
-        <joda-time.version>2.9.6</joda-time.version>
+        <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
+        <handlebars.version>4.1.0</handlebars.version>
+        <joda-time.version>2.10</joda-time.version>
         <jstl.version>1.2</jstl.version>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <inject.version>1</inject.version>
 
         <!-- Maven plugins -->
diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
similarity index 100%
rename from handling-spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
rename to spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/spring/AppConfig.java b/spring-static-resources/src/main/java/org/baeldung/spring/AppConfig.java
similarity index 100%
rename from handling-spring-static-resources/src/main/java/org/baeldung/spring/AppConfig.java
rename to spring-static-resources/src/main/java/org/baeldung/spring/AppConfig.java
diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java
similarity index 97%
rename from handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java
rename to spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java
index 4a198cf195..dbc548e028 100644
--- a/handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -15,7 +15,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 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.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.resource.GzipResourceResolver;
@@ -27,7 +27,7 @@ import org.springframework.web.servlet.view.JstlView;
 @Configuration
 @ComponentScan(basePackages = { "org.baeldung.web.controller", "org.baeldung.persistence.service", "org.baeldung.persistence.dao" })
 @EnableWebMvc
-public class MvcConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig implements WebMvcConfigurer {
     @Autowired
     Environment env;
 
@@ -39,7 +39,6 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
 
     @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
         registry.addViewController("/login.html");
         registry.addViewController("/home.html");
 
diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java
similarity index 100%
rename from handling-spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java
rename to spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java
diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java b/spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java
similarity index 100%
rename from handling-spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java
rename to spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java
diff --git a/handling-spring-static-resources/src/main/resources/application.properties b/spring-static-resources/src/main/resources/application.properties
similarity index 100%
rename from handling-spring-static-resources/src/main/resources/application.properties
rename to spring-static-resources/src/main/resources/application.properties
diff --git a/handling-spring-static-resources/src/main/resources/logback.xml b/spring-static-resources/src/main/resources/logback.xml
similarity index 100%
rename from handling-spring-static-resources/src/main/resources/logback.xml
rename to spring-static-resources/src/main/resources/logback.xml
diff --git a/handling-spring-static-resources/src/main/resources/messages_en.properties b/spring-static-resources/src/main/resources/messages_en.properties
similarity index 100%
rename from handling-spring-static-resources/src/main/resources/messages_en.properties
rename to spring-static-resources/src/main/resources/messages_en.properties
diff --git a/handling-spring-static-resources/src/main/resources/messages_es_ES.properties b/spring-static-resources/src/main/resources/messages_es_ES.properties
similarity index 100%
rename from handling-spring-static-resources/src/main/resources/messages_es_ES.properties
rename to spring-static-resources/src/main/resources/messages_es_ES.properties
diff --git a/spring-static-resources/src/main/resources/webSecurityConfig.xml b/spring-static-resources/src/main/resources/webSecurityConfig.xml
new file mode 100644
index 0000000000..ea64ad5aea
--- /dev/null
+++ b/spring-static-resources/src/main/resources/webSecurityConfig.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<security:http use-expressions="true">
+
+	<security:intercept-url pattern="/login*" access="permitAll"/>
+        <security:intercept-url pattern="/logout*" access="permitAll"/>
+        <security:intercept-url pattern="/home*" access="permitAll"/>
+        <security:intercept-url pattern="/files/**" access="permitAll"/>
+        <security:intercept-url pattern="/resources/**" access="permitAll"/>
+        <security:intercept-url pattern="/js/**" access="permitAll"/>
+        <security:intercept-url pattern="/other-files/**" access="permitAll"/>
+        <security:intercept-url pattern="/invalidSession*" access="isAnonymous()"/>
+        <security:intercept-url pattern="/**" access="isAuthenticated()"/>
+
+        <security:form-login login-page='/login.html' authentication-failure-url="/login.html?error=true" authentication-success-handler-ref="myAuthenticationSuccessHandler"
+            default-target-url="/home"/>
+        <security:session-management invalid-session-url="/invalidSession.html" session-fixation-protection="none"/>
+        <security:logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" delete-cookies="JSESSIONID"/>
+	</security:http>
+
+    <bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
+    
+	<security:authentication-manager>
+		<security:authentication-provider>
+			<security:user-service>
+				<security:user name="user1" password="user1Pass" authorities="ROLE_USER"/>
+                <security:user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN"/>
+			</security:user-service>
+		</security:authentication-provider>
+	</security:authentication-manager>
+
+</beans>
diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html b/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html
rename to spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html
diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css b/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css
rename to spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css
diff --git a/spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml
new file mode 100644
index 0000000000..c046aa16a9
--- /dev/null
+++ b/spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
+</beans>
diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp b/spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp
rename to spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp
diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp b/spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp
rename to spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp
diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml b/spring-static-resources/src/main/webapp/WEB-INF/web.xml
similarity index 97%
rename from handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml
rename to spring-static-resources/src/main/webapp/WEB-INF/web.xml
index e9d784e940..4bb60e4f2c 100644
--- a/handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml
+++ b/spring-static-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    version="2.5"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0"
 >
 
     <context-param>
diff --git a/handling-spring-static-resources/src/main/webapp/js/bootstrap.css b/spring-static-resources/src/main/webapp/js/bootstrap.css
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/bootstrap.css
rename to spring-static-resources/src/main/webapp/js/bootstrap.css
diff --git a/handling-spring-static-resources/src/main/webapp/js/foo.js b/spring-static-resources/src/main/webapp/js/foo.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/foo.js
rename to spring-static-resources/src/main/webapp/js/foo.js
diff --git a/handling-spring-static-resources/src/main/webapp/js/handlebars-3133af2.js b/spring-static-resources/src/main/webapp/js/handlebars-3133af2.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/handlebars-3133af2.js
rename to spring-static-resources/src/main/webapp/js/handlebars-3133af2.js
diff --git a/handling-spring-static-resources/src/main/webapp/js/helpers/utils.js b/spring-static-resources/src/main/webapp/js/helpers/utils.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/helpers/utils.js
rename to spring-static-resources/src/main/webapp/js/helpers/utils.js
diff --git a/handling-spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js b/spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js
rename to spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js
diff --git a/handling-spring-static-resources/src/main/webapp/js/main.js b/spring-static-resources/src/main/webapp/js/main.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/main.js
rename to spring-static-resources/src/main/webapp/js/main.js
diff --git a/handling-spring-static-resources/src/main/webapp/js/require.gz b/spring-static-resources/src/main/webapp/js/require.gz
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/require.gz
rename to spring-static-resources/src/main/webapp/js/require.gz
diff --git a/handling-spring-static-resources/src/main/webapp/js/require.js b/spring-static-resources/src/main/webapp/js/require.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/require.js
rename to spring-static-resources/src/main/webapp/js/require.js
diff --git a/handling-spring-static-resources/src/main/webapp/js/router.js b/spring-static-resources/src/main/webapp/js/router.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/js/router.js
rename to spring-static-resources/src/main/webapp/js/router.js
diff --git a/handling-spring-static-resources/src/main/webapp/other-resources/Hello.html b/spring-static-resources/src/main/webapp/other-resources/Hello.html
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/other-resources/Hello.html
rename to spring-static-resources/src/main/webapp/other-resources/Hello.html
diff --git a/handling-spring-static-resources/src/main/webapp/other-resources/bootstrap.css b/spring-static-resources/src/main/webapp/other-resources/bootstrap.css
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/other-resources/bootstrap.css
rename to spring-static-resources/src/main/webapp/other-resources/bootstrap.css
diff --git a/handling-spring-static-resources/src/main/webapp/other-resources/foo.js b/spring-static-resources/src/main/webapp/other-resources/foo.js
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/other-resources/foo.js
rename to spring-static-resources/src/main/webapp/other-resources/foo.js
diff --git a/handling-spring-static-resources/src/main/webapp/resources/bootstrap.css b/spring-static-resources/src/main/webapp/resources/bootstrap.css
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/resources/bootstrap.css
rename to spring-static-resources/src/main/webapp/resources/bootstrap.css
diff --git a/handling-spring-static-resources/src/main/webapp/resources/myCss.css b/spring-static-resources/src/main/webapp/resources/myCss.css
similarity index 100%
rename from handling-spring-static-resources/src/main/webapp/resources/myCss.css
rename to spring-static-resources/src/main/webapp/resources/myCss.css