diff --git a/jsf/pom.xml b/jsf/pom.xml
index 7b15cf9336..6f43e08535 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -13,12 +13,39 @@
     <version>0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <dependencies>
-        <!-- http://mvnrepository.com/artifact/com.sun.faces/mojarra-jsf-impl -->
         <dependency>
             <groupId>com.sun.faces</groupId>
-            <artifactId>mojarra-jsf-impl</artifactId>
-            <version>2.0.0-b04</version>
+            <artifactId>jsf-api</artifactId>
+            <version>${com.sun.faces.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.faces</groupId>
+            <artifactId>jsf-impl</artifactId>
+            <version>${com.sun.faces.version}</version>
+        </dependency>
+
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-messaging</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>
@@ -34,4 +61,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <!-- Spring -->
+        <org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+        <com.sun.faces.version>2.1.7</com.sun.faces.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/jsf/src/main/java/com/baeldung/springintegration/dao/UserManagementDAOImpl.java b/jsf/src/main/java/com/baeldung/springintegration/dao/UserManagementDAOImpl.java
index 6bdcb57cfa..b27aa582e3 100644
--- a/jsf/src/main/java/com/baeldung/springintegration/dao/UserManagementDAOImpl.java
+++ b/jsf/src/main/java/com/baeldung/springintegration/dao/UserManagementDAOImpl.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.baeldung.springintegration.dao;
 
 import java.util.ArrayList;
@@ -10,16 +6,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.PostConstruct;
 
-/**
- * @author Tayo
- */
 public class UserManagementDAOImpl extends IUserManagementDAO {
 
     private List<String> users;
 
     @PostConstruct
     public void initUserList() {
-        users = new ArrayList<String>();
+        users = new ArrayList<>();
     }
 
     @Override
diff --git a/jsf/src/main/java/com/baeldung/springintegration/resources/constraints.properties b/jsf/src/main/resources/constraints.properties
similarity index 100%
rename from jsf/src/main/java/com/baeldung/springintegration/resources/constraints.properties
rename to jsf/src/main/resources/constraints.properties
diff --git a/jsf/src/main/java/com/baeldung/springintegration/resources/messages.properties b/jsf/src/main/resources/messages.properties
similarity index 100%
rename from jsf/src/main/java/com/baeldung/springintegration/resources/messages.properties
rename to jsf/src/main/resources/messages.properties
diff --git a/jsf/src/main/webapp/WEB-INF/applicationContext.xml b/jsf/src/main/webapp/WEB-INF/applicationContext.xml
index 8553300e1e..385a0b8680 100644
--- a/jsf/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/jsf/src/main/webapp/WEB-INF/applicationContext.xml
@@ -10,6 +10,6 @@
 ">
 
     <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor" />
-    <bean class="com.baeldung.dao.UserManagementDAOImpl" id="userManagementDAO"/>
+    <bean class="com.baeldung.springintegration.dao.UserManagementDAOImpl" id="userManagementDAO"/>
     
 </beans>
diff --git a/jsf/src/main/webapp/WEB-INF/faces-config.xml b/jsf/src/main/webapp/WEB-INF/faces-config.xml
index 6142d81daf..69baa5b05a 100644
--- a/jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/jsf/src/main/webapp/WEB-INF/faces-config.xml
@@ -10,7 +10,7 @@
     <application>
         <resource-bundle>
             <base-name>
-                com.baeldung.resources.messages
+               messages
             </base-name>
             <var>
                 msg
@@ -18,7 +18,7 @@
         </resource-bundle>
         <resource-bundle>
             <base-name>
-                com.baeldung.resources.constraints
+                constraints
             </base-name>
             <var>
                 constraints
diff --git a/jsf/src/main/webapp/index.xhtml b/jsf/src/main/webapp/index.xhtml
index d71451abcc..3fc91ea376 100644
--- a/jsf/src/main/webapp/index.xhtml
+++ b/jsf/src/main/webapp/index.xhtml
@@ -1,27 +1,28 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:h="http://java.sun.com/jsf/html"
 
       xmlns:f="http://java.sun.com/jsf/core">
 
-    <h:head>
-        <title>Baeldung | Register</title>
-    </h:head>
-    <h:body>
-
-        <h:form>
-            <f:ajax>
-                <h:panelGrid id="theGrid" columns="3">
-                    <h:outputText value="Username"/>
-                    <h:inputText id="firstName" binding="#{userNameTextbox}" required="true" requiredMessage="#{msg['message.valueRequired']}" value="#{registration.userName}"/>
-                    <h:message for="firstName" />
-                    <h:commandButton  value="#{msg['label.saveButton']}" action="#{registration.theUserDao.createUser(userNameTextbox.value)}"/>
-                    <h:outputText value="#{registration.operationMessage}"/>
-                </h:panelGrid>
-            </f:ajax>
-        </h:form>
-
-    </h:body>
+<h:head>
+    <title>Baeldung | Register</title>
+</h:head>
+<h:body>
+    <h:form>
+        <f:ajax>
+            <h:panelGrid id="theGrid" columns="3">
+                <h:outputText value="Username"/>
+                <h:inputText id="firstName" binding="#{userNameTextbox}" required="true"
+                             requiredMessage="#{msg['message.valueRequired']}" value="#{registration.userName}"/>
+                <h:message for="firstName"/>
+                <h:commandButton value="#{msg['label.saveButton']}"
+                                 action="#{registration.theUserDao.createUser(userNameTextbox.value)}"/>
+                <h:outputText value="#{registration.operationMessage}"/>
+            </h:panelGrid>
+        </f:ajax>
+    </h:form>
+</h:body>
 </html>