From 9438588be83453db75bb037b313bdd63cb8516e8 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Thu, 7 Jan 2016 15:17:26 +0200
Subject: [PATCH] cleanup and upgrade

---
 .../src/main/webapp/WEB-INF/view/login.jsp    |  2 +-
 .../pom.xml                                   | 23 +++++++++++--------
 .../src/main/resources/webSecurityConfig.xml  | 14 +++++------
 .../src/main/webapp/WEB-INF/view/console.jsp  |  2 +-
 .../src/main/webapp/WEB-INF/view/homepage.jsp |  2 +-
 .../src/main/webapp/WEB-INF/view/login.jsp    |  8 +++----
 .../src/main/webapp/WEB-INF/view/login.jsp    |  2 +-
 spring-security-oauth/pom.xml                 |  2 +-
 8 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/login.jsp
index 762218e40f..eb41cc79a8 100644
--- a/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/login.jsp
+++ b/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/login.jsp
@@ -17,7 +17,7 @@
 			</tr>
 			<tr>
 				<td>Remember Me:</td>
-				<td><input type="checkbox" name="remember_me" /></td>
+				<td><input type="checkbox" name="remember-me" /></td>
 			</tr>
 			<tr>
 				<td><input name="submit" type="submit" value="submit" /></td>
diff --git a/spring-security-mvc-persisted-remember-me/pom.xml b/spring-security-mvc-persisted-remember-me/pom.xml
index 37f271f66d..1691f10f43 100644
--- a/spring-security-mvc-persisted-remember-me/pom.xml
+++ b/spring-security-mvc-persisted-remember-me/pom.xml
@@ -93,14 +93,14 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>${javax.servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
-			<version>1.2</version>
+			<version>${jstl.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		
@@ -109,13 +109,13 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.178</version>
+			<version>${h2.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.1-901.jdbc4</version>
+			<version>${postgresql.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		
@@ -260,12 +260,15 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
+		<org.springframework.security.version>4.0.3.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.3.10.Final</hibernate.version>
-		<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+		<hibernate.version>4.3.11.Final</hibernate.version>
+		<mysql-connector-java.version>5.1.37</mysql-connector-java.version>
+		<h2.version>1.4.190</h2.version>
+		<postgresql.version>9.1-901.jdbc4</postgresql.version>
+		
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.12</org.slf4j.version>
@@ -273,9 +276,11 @@
 
 		<!-- various -->
 		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+		<javax.servlet.version>3.0.1</javax.servlet.version>
+		<jstl.version>1.2</jstl.version>
 
 		<!-- util -->
-		<guava.version>18.0</guava.version>
+		<guava.version>19.0</guava.version>
 		<commons-lang3.version>3.4</commons-lang3.version>
 
 		<!-- testing -->
diff --git a/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml
index 0fa077db00..a11f13c9ab 100644
--- a/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml
@@ -7,11 +7,11 @@
 	xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
     xsi:schemaLocation="
-		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
+		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd">
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
 
 
     <http use-expressions="true">
@@ -35,9 +35,9 @@
 
 	<!-- Persistent Remember Me Service -->
 	<beans:bean id="rememberMeAuthenticationProvider" class="org.springframework.security.web.authentication.rememberme.PersistentTokenBasedRememberMeServices">
-		<beans:property name="key" value="myAppKey" />
-		<beans:property name="tokenRepository" ref="jdbcTokenRepository" />
- 		<beans:property name="userDetailsService" ref="myUserDetailsService" />
+		<beans:constructor-arg value="myAppKey" />
+		<beans:constructor-arg ref="jdbcTokenRepository" />
+ 		<beans:constructor-arg ref="myUserDetailsService" />
  	</beans:bean>
  
  	<!-- Uses a database table to maintain a set of persistent login data -->
diff --git a/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/console.jsp
index d18b59a10c..5a58d8892f 100644
--- a/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/console.jsp
+++ b/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/console.jsp
@@ -16,7 +16,7 @@
 		<br/>
 	</security:authorize>
 
-	<a href="<c:url value="/j_spring_security_logout" />">Logout</a>
+	<a href="<c:url value="/logout" />">Logout</a>
 	
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/homepage.jsp
index afd2c6da59..2568adec66 100644
--- a/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/homepage.jsp
+++ b/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/homepage.jsp
@@ -16,7 +16,7 @@
 		<br />
 	</security:authorize>
 
-	<a href="<c:url value="/j_spring_security_logout" />">Logout</a>
+	<a href="<c:url value="/logout" />">Logout</a>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/login.jsp
index 5697d1544a..7636cd5e61 100644
--- a/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/login.jsp
+++ b/spring-security-mvc-persisted-remember-me/src/main/webapp/WEB-INF/view/login.jsp
@@ -17,20 +17,20 @@
 <body>
 	<h1>Login</h1>
 
-	<form name='f' action="j_spring_security_check" method='POST'>
+	<form name='f' action="login" method='POST'>
 
 		<table>
 			<tr>
 				<td>User:</td>
-				<td><input type='text' name='j_username' value=''></td>
+				<td><input type='text' name='username' value=''></td>
 			</tr>
 			<tr>
 				<td>Password:</td>
-				<td><input type='password' name='j_password' /></td>
+				<td><input type='password' name='password' /></td>
 			</tr>
 			<tr>
 				<td>Remember Me:</td>
-				<td><input type="checkbox" name="_spring_security_remember_me" /></td>
+				<td><input type="checkbox" name="remember-me" /></td>
 			</tr>
 			<tr>
 				<td><input name="submit" type="submit" value="submit" /></td>
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp
index 762218e40f..eb41cc79a8 100644
--- a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp
+++ b/spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp
@@ -17,7 +17,7 @@
 			</tr>
 			<tr>
 				<td>Remember Me:</td>
-				<td><input type="checkbox" name="remember_me" /></td>
+				<td><input type="checkbox" name="remember-me" /></td>
 			</tr>
 			<tr>
 				<td><input name="submit" type="submit" value="submit" /></td>
diff --git a/spring-security-oauth/pom.xml b/spring-security-oauth/pom.xml
index 473a4e5c35..7bb7aa86c8 100644
--- a/spring-security-oauth/pom.xml
+++ b/spring-security-oauth/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.7.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
         
     <modules>