diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml
index f0c4b4b..09d6e82 100644
--- a/booking-faces/pom.xml
+++ b/booking-faces/pom.xml
@@ -104,24 +104,24 @@
         </dependency>
 		<!-- Logging -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jul-to-slf4j</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<!-- Test -->
 		<dependency>
diff --git a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
index 8898767..30aed80 100644
--- a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
+++ b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
@@ -1,11 +1,11 @@
 package org.springframework.webflow.samples.booking.config;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
 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.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 
 @Configuration
@@ -33,17 +33,16 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 			.csrf().disable()
 			.requestCache()
 				.requestCache(new HttpSessionRequestCache());
-
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
 		auth.inMemoryAuthentication()
-			.passwordEncoder(new Md5PasswordEncoder())
-			.withUser("keith").password("417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
-			.withUser("erwin").password("12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
-			.withUser("jeremy").password("57c6cbff0d421449be820763f03139eb").roles("USER").and()
-			.withUser("scott").password("942f2339bf50796de535a384f0d1af3e").roles("USER");
+			.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");
 	}
 
 }
diff --git a/booking-faces/src/main/resources/log4j2.xml b/booking-faces/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..f495463
--- /dev/null
+++ b/booking-faces/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.samples" level="debug" />
+		<Root level="info">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/booking-faces/src/main/resources/logback.xml b/booking-faces/src/main/resources/logback.xml
deleted file mode 100644
index 1202bc6..0000000
--- a/booking-faces/src/main/resources/logback.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
-	</appender>
-
-	<logger name="org.springframework.samples" level="debug">
-		<appender-ref ref="STDOUT" />
-	</logger>
-
-	<root level="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
\ No newline at end of file
diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index a762437..5c4e55c 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -35,7 +35,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
-			<artifactId>spring-js</artifactId>
+			<artifactId>spring-js-resources</artifactId>
 			<version>${webflow.version}</version>
 		</dependency>
 		<dependency>
@@ -101,27 +101,27 @@
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-core</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-api</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-template</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-servlet</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-jsp</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles.version}</version>
 		</dependency>
 		<!-- Database, JPA -->
 		<dependency>
@@ -161,19 +161,24 @@
 		</dependency>
 		<!-- Logging -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 
 		<!-- Test -->
diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
index a359a85..c31f82b 100644
--- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
+++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
@@ -1,7 +1,6 @@
 package org.springframework.webflow.samples.booking.config;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
 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;
@@ -28,11 +27,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
 		auth.inMemoryAuthentication()
-			.passwordEncoder(new Md5PasswordEncoder())
-			.withUser("keith").password("417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
-			.withUser("erwin").password("12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
-			.withUser("jeremy").password("57c6cbff0d421449be820763f03139eb").roles("USER").and()
-			.withUser("scott").password("942f2339bf50796de535a384f0d1af3e").roles("USER");
+			.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");
 	}
 
 }
diff --git a/booking-mvc/src/main/resources/log4j2.xml b/booking-mvc/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..f495463
--- /dev/null
+++ b/booking-mvc/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.samples" level="debug" />
+		<Root level="info">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/booking-mvc/src/main/resources/logback.xml b/booking-mvc/src/main/resources/logback.xml
deleted file mode 100644
index 1202bc6..0000000
--- a/booking-mvc/src/main/resources/logback.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
-	</appender>
-
-	<logger name="org.springframework.samples" level="debug">
-		<appender-ref ref="STDOUT" />
-	</logger>
-
-	<root level="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 228d5c6..5bd0d02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,19 +18,19 @@
 	<properties>
 		<easymock.version>3.4</easymock.version>
 		<hsqldb.version>2.4.0</hsqldb.version>
-		<hibernate.version>3.6.9.Final</hibernate.version>
-		<hibernate-validator.version>4.3.2.Final</hibernate-validator.version>
+		<hibernate.version>5.2.12.Final</hibernate.version>
+		<hibernate-validator.version>6.0.7.Final</hibernate-validator.version>
 		<jaxb.version>2.2.3</jaxb.version>
 		<jetty-maven-plugin.version>9.4.8.v20171121</jetty-maven-plugin.version>
 		<junit.version>4.12</junit.version>
-		<logback.version>1.2.3</logback.version>
+		<log4j.version>2.10.0</log4j.version>
 		<mojarra.version>2.2.16</mojarra.version>
 		<myfaces.version>2.2.12</myfaces.version>
 		<primefaces.version>6.1</primefaces.version>
-		<servlet.version>3.0.1</servlet.version>
-		<slf4j.version>1.7.25</slf4j.version>
-		<spring-security.version>4.2.4.RELEASE</spring-security.version>
-		<webflow.version>2.4.7.RELEASE</webflow.version>
+		<servlet.version>3.1.0</servlet.version>
+		<spring-security.version>5.0.1.RELEASE</spring-security.version>
+		<tiles.version>3.0.8</tiles.version>
+		<webflow.version>2.5.0.BUILD-SNAPSHOT</webflow.version>
 	</properties>
 
 	<dependencyManagement>
@@ -38,10 +38,15 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-framework-bom</artifactId>
-				<version>4.3.13.RELEASE</version>
+				<version>5.0.3.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>1.7.25</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml
index db12f97..9dbee5a 100644
--- a/primefaces-showcase/pom.xml
+++ b/primefaces-showcase/pom.xml
@@ -101,24 +101,24 @@
 		</dependency>
 		<!-- Logging -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jul-to-slf4j</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 	</dependencies>
 
diff --git a/primefaces-showcase/src/main/resources/log4j2.xml b/primefaces-showcase/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..f495463
--- /dev/null
+++ b/primefaces-showcase/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.samples" level="debug" />
+		<Root level="info">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/primefaces-showcase/src/main/resources/logback.xml b/primefaces-showcase/src/main/resources/logback.xml
deleted file mode 100644
index 1202bc6..0000000
--- a/primefaces-showcase/src/main/resources/logback.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
-	</appender>
-
-	<logger name="org.springframework.samples" level="debug">
-		<appender-ref ref="STDOUT" />
-	</logger>
-
-	<root level="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
\ No newline at end of file
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
index 3048456..a359a72 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
@@ -1,42 +1,22 @@
 <?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/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://www.springframework.org/schema/security
-           http://www.springframework.org/schema/security/spring-security.xsd">
+<b:beans xmlns="http://www.springframework.org/schema/security"
+		 xmlns:b="http://www.springframework.org/schema/beans"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+						http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
-	<!-- 
-		Configure Spring Security 
-	-->
-	<security:http auto-config="true" use-expressions="true">
-		<security:form-login login-page="/app/login" login-processing-url="/app/loginProcess"
+	<http auto-config="true" use-expressions="true">
+		<form-login login-page="/app/login" login-processing-url="/app/loginProcess"
 			default-target-url="/app/home" authentication-failure-url="/app/login?login_error=1" />
-		<security:logout logout-url="/app/logout" logout-success-url="/app/home" />
-		<security:intercept-url pattern="/secured/appleUser" method="POST" access="hasRole('ROLE_APPLE_USER')" />
-		<security:intercept-url pattern="/secured/androidUser" method="POST" access="hasRole('ROLE_ANDROID_USER')" />
-		<security:csrf disabled="true" />
-	</security:http>
+		<logout logout-url="/app/logout" logout-success-url="/app/home" />
+		<intercept-url pattern="/secured/appleUser" method="POST" access="hasRole('ROLE_APPLE_USER')" />
+		<intercept-url pattern="/secured/androidUser" method="POST" access="hasRole('ROLE_ANDROID_USER')" />
+		<csrf disabled="true" />
+	</http>
 
-	<!--
-		Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc)
-		
-		usernames/passwords are:
-			joe/joe1
-			pete/pete1
-	-->
-	<security:authentication-manager>
-		<security:authentication-provider>
-			<security:password-encoder hash="md5" />
-			<security:user-service>
-				<security:user name="joe" password="bf403351dfb2ae819874163aff25a49c" 
-					authorities="ROLE_USER, ROLE_APPLE_USER" />
-				<security:user name="pete" password="5d2ea1f70185e4357183bb9c00187219" 
-					authorities="ROLE_USER, ROLE_ANDROID_USER" />
-			</security:user-service>
-		</security:authentication-provider>
-	</security:authentication-manager>	
+	<user-service>
+		<user name="joe" password="{MD5}bf403351dfb2ae819874163aff25a49c" authorities="ROLE_USER, ROLE_APPLE_USER" />
+		<user name="pete" password="{MD5}5d2ea1f70185e4357183bb9c00187219" authorities="ROLE_USER, ROLE_ANDROID_USER" />
+	</user-service>
 
-</beans>
\ No newline at end of file
+</b:beans>
\ No newline at end of file
diff --git a/webflow-showcase/pom.xml b/webflow-showcase/pom.xml
index 1239a4c..fce2aa7 100644
--- a/webflow-showcase/pom.xml
+++ b/webflow-showcase/pom.xml
@@ -35,42 +35,9 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
-			<artifactId>spring-js</artifactId>
+			<artifactId>spring-js-resources</artifactId>
 			<version>${webflow.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-web</artifactId>
-			<version>${spring-security.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				</exclusion>
-			</exclusions>						
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-taglibs</artifactId>
-			<version>${spring-security.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-config</artifactId>
-			<version>${spring-security.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				</exclusion>
-			</exclusions>						
-        </dependency>
 		<!-- Servlet -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -93,7 +60,7 @@
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-jsp</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles.version}</version>
 		</dependency>
 		<!-- JSR 303 validation -->
 		<dependency>
@@ -103,19 +70,24 @@
 		</dependency>
 		<!-- Logging -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 	</dependencies>
 
diff --git a/webflow-showcase/src/main/resources/log4j2.xml b/webflow-showcase/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..956373e
--- /dev/null
+++ b/webflow-showcase/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.webflow" level="debug" />
+		<Root level="info">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/webflow-showcase/src/main/resources/logback.xml b/webflow-showcase/src/main/resources/logback.xml
deleted file mode 100644
index 799e50e..0000000
--- a/webflow-showcase/src/main/resources/logback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
-	</appender>
-
-	<logger name="org.springframework.samples" level="debug">
-		<appender-ref ref="STDOUT" />
-	</logger>
-
-	<logger name="org.springframework.webflow" level="debug">
-		<appender-ref ref="STDOUT" />
-	</logger>
-
-	<root level="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
\ No newline at end of file
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp b/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp
index 4601210..9db1b88 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp
+++ b/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp
@@ -1,6 +1,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
-<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <!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" xml:lang="en" lang="en">
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/controllers.xml
similarity index 100%
rename from webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
rename to webflow-showcase/src/main/webapp/WEB-INF/spring/controllers.xml
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/root-context.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/root-context.xml
deleted file mode 100644
index 486e22d..0000000
--- a/webflow-showcase/src/main/webapp/WEB-INF/spring/root-context.xml
+++ /dev/null
@@ -1,9 +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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-	
-	<!-- Root Context: defines shared resources visible to all other web components -->
-	<import resource="security-config.xml"/>
-	
-</beans>
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
deleted file mode 100644
index 8dc75ec..0000000
--- a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
+++ /dev/null
@@ -1,35 +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:security="http://www.springframework.org/schema/security"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://www.springframework.org/schema/security
-           http://www.springframework.org/schema/security/spring-security.xsd">
-
-	<!-- 
-		Configure Spring Security 
-	-->
-	<security:http auto-config="true"/>
-
-	<!--
-		Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc)
-		
-		usernames/passwords are:
-			keith/melbourne
-			rossen/london
-	-->
-	<security:authentication-manager>
-		<security:authentication-provider>
-			<security:password-encoder hash="md5" />
-			<security:user-service>
-				<security:user name="keith" password="417c7382b16c395bc25b5da1398cf076" 
-					authorities="ROLE_USER, ROLE_APPLE_USER" />
-				<security:user name="rossen" password="bc180dbc583491c00f8a1cd134f7517b" 
-					authorities="ROLE_USER, ROLE_ANDROID_USER" />
-			</security:user-service>
-		</security:authentication-provider>
-	</security:authentication-manager>	
-
-</beans>
\ No newline at end of file
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml
similarity index 93%
rename from webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
rename to webflow-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml
index b7c8452..e59e9e1 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ b/webflow-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml
@@ -33,12 +33,12 @@
 	</bean>
 
 	<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
-	<bean id="tilesViewResolver" class="org.springframework.js.ajax.AjaxUrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.webflow.mvc.view.FlowAjaxTilesView"/>
+	<bean id="tilesViewResolver" class="org.springframework.webflow.mvc.view.AjaxUrlBasedViewResolver">
+		<property name="viewClass" value="org.springframework.webflow.mvc.view.FlowAjaxTiles3View"/>
 	</bean>
 
 	<!-- Configures the Tiles layout system -->
-	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
+	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
 		<property name="definitions">
 			<list>
 				<value>/WEB-INF/**/views.xml</value>
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/webflow.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/webflow.xml
similarity index 80%
rename from webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/webflow.xml
rename to webflow-showcase/src/main/webapp/WEB-INF/spring/webflow.xml
index ac8d281..8588f3f 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/webflow.xml
+++ b/webflow-showcase/src/main/webapp/WEB-INF/spring/webflow.xml
@@ -9,12 +9,8 @@
            http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
 
 	<!-- Executes flows: the entry point into the Spring Web Flow system -->
-	<webflow:flow-executor id="flowExecutor">
-		<webflow:flow-execution-listeners>
-			<webflow:listener ref="securityFlowExecutionListener" />
-		</webflow:flow-execution-listeners>
-	</webflow:flow-executor>
-	
+	<webflow:flow-executor id="flowExecutor"/>
+
 	<!-- The registry of executable flow definitions -->
 	<webflow:flow-registry id="flowRegistry" flow-builder-services="flowBuilderServices" base-path="/WEB-INF/flows">
 		<webflow:flow-location-pattern value="/**/flow.xml" />
@@ -33,7 +29,4 @@
 	<!-- Bootstraps JSR-303 validation and exposes it through Spring's Validator interface -->
 	<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
 	
-	<!-- Installs a listener to apply Spring Security authorities -->
-	<bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" />
-		
 </beans>
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/web.xml b/webflow-showcase/src/main/webapp/WEB-INF/web.xml
index 15f8c88..e80260c 100755
--- a/webflow-showcase/src/main/webapp/WEB-INF/web.xml
+++ b/webflow-showcase/src/main/webapp/WEB-INF/web.xml
@@ -3,55 +3,18 @@
 		 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
 		 version="3.0">
 
-<!-- The master configuration file for this Spring web application -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/spring/root-context.xml
-		</param-value>
-	</context-param>
-
-	<!-- Loads the Spring web application context -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- Enables use of HTTP methods PUT and DELETE -->
-	<filter>
-		<filter-name>httpMethodFilter</filter-name>
-		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>httpMethodFilter</filter-name>
-		<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
-	</filter-mapping>
-
-	<!-- Enables Spring Security -->
-	<filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-
-    <filter-mapping>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
-    </filter-mapping>
-
-	<!-- The front controller of this Spring Web application, responsible for handling all application requests -->
 	<servlet>
-		<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
+		<servlet-name>DispatcherServlet</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/spring/appServlet/servlet-context.xml</param-value>
+			<param-value>/WEB-INF/spring/servlet-context.xml</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 		
-	<!-- Map all *.spring requests to the DispatcherServlet for handling -->
 	<servlet-mapping>
-		<servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
+		<servlet-name>DispatcherServlet</servlet-name>
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>