cleanup and upgrade
This commit is contained in:
		
							parent
							
								
									dbc703c63a
								
							
						
					
					
						commit
						493d953f85
					
				| @ -87,14 +87,14 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.servlet</groupId> |             <groupId>javax.servlet</groupId> | ||||||
|             <artifactId>javax.servlet-api</artifactId> |             <artifactId>javax.servlet-api</artifactId> | ||||||
|             <version>3.0.1</version> |             <version>${javax.servlet.version}</version> | ||||||
|             <scope>provided</scope> |             <scope>provided</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.servlet</groupId> |             <groupId>javax.servlet</groupId> | ||||||
|             <artifactId>jstl</artifactId> |             <artifactId>jstl</artifactId> | ||||||
|             <version>1.2</version> |             <version>${jstl.version}</version> | ||||||
|             <scope>runtime</scope> |             <scope>runtime</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
| @ -235,6 +235,8 @@ | |||||||
| 
 | 
 | ||||||
|         <!-- various --> |         <!-- various --> | ||||||
|         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version> |         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version> | ||||||
|  |         <javax.servlet.version>3.0.1</javax.servlet.version> | ||||||
|  |         <jstl.version>1.2</jstl.version> | ||||||
| 
 | 
 | ||||||
|         <!-- util --> |         <!-- util --> | ||||||
|         <guava.version>19.0</guava.version> |         <guava.version>19.0</guava.version> | ||||||
|  | |||||||
| @ -12,6 +12,8 @@ | |||||||
|         <intercept-url pattern="/login*" access="permitAll"/> |         <intercept-url pattern="/login*" access="permitAll"/> | ||||||
|         <intercept-url pattern="/**" access="isAuthenticated()"/> |         <intercept-url pattern="/**" access="isAuthenticated()"/> | ||||||
| 
 | 
 | ||||||
|  |         <csrf disabled="true"/> | ||||||
|  |          | ||||||
|         <form-login login-page='/login.html' login-processing-url="/perform_login" default-target-url="/homepage.html" authentication-failure-url="/login.html?error=true" |         <form-login login-page='/login.html' login-processing-url="/perform_login" default-target-url="/homepage.html" authentication-failure-url="/login.html?error=true" | ||||||
|             always-use-default-target="true"/> |             always-use-default-target="true"/> | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -9,11 +9,11 @@ | |||||||
| 		<table> | 		<table> | ||||||
| 			<tr> | 			<tr> | ||||||
| 				<td>User:</td> | 				<td>User:</td> | ||||||
| 				<td><input type='text' name='j_username' value=''></td> | 				<td><input type='text' name='username' value=''></td> | ||||||
| 			</tr> | 			</tr> | ||||||
| 			<tr> | 			<tr> | ||||||
| 				<td>Password:</td> | 				<td>Password:</td> | ||||||
| 				<td><input type='password' name='j_password' /></td> | 				<td><input type='password' name='password' /></td> | ||||||
| 			</tr> | 			</tr> | ||||||
| 			<tr> | 			<tr> | ||||||
| 				<td><input name="submit" type="submit" value="submit" /></td> | 				<td><input name="submit" type="submit" value="submit" /></td> | ||||||
|  | |||||||
| @ -88,7 +88,7 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>com.fasterxml.jackson.core</groupId> |             <groupId>com.fasterxml.jackson.core</groupId> | ||||||
|             <artifactId>jackson-databind</artifactId> |             <artifactId>jackson-databind</artifactId> | ||||||
|             <version>2.2.3</version> |             <version>${jackson.version}</version> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
|         <!-- http --> |         <!-- http --> | ||||||
| @ -134,14 +134,14 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.servlet</groupId> |             <groupId>javax.servlet</groupId> | ||||||
|             <artifactId>javax.servlet-api</artifactId> |             <artifactId>javax.servlet-api</artifactId> | ||||||
|             <version>3.0.1</version> |             <version>${javax.servlet.version}</version> | ||||||
|             <scope>provided</scope> |             <scope>provided</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.servlet</groupId> |             <groupId>javax.servlet</groupId> | ||||||
|             <artifactId>jstl</artifactId> |             <artifactId>jstl</artifactId> | ||||||
|             <version>1.2</version> |             <version>${jstl.version}</version> | ||||||
|             <scope>runtime</scope> |             <scope>runtime</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
| @ -304,7 +304,10 @@ | |||||||
| 
 | 
 | ||||||
|         <!-- various --> |         <!-- various --> | ||||||
|         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version> |         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version> | ||||||
| 
 |         <jstl.version>1.2</jstl.version> | ||||||
|  |         <javax.servlet.version>3.0.1</javax.servlet.version> | ||||||
|  |         <jackson.version>2.2.3</jackson.version> | ||||||
|  |          | ||||||
|         <!-- util --> |         <!-- util --> | ||||||
|         <guava.version>19.0</guava.version> |         <guava.version>19.0</guava.version> | ||||||
|         <commons-lang3.version>3.4</commons-lang3.version> |         <commons-lang3.version>3.4</commons-lang3.version> | ||||||
|  | |||||||
| @ -10,7 +10,7 @@ | |||||||
|     <parent> |     <parent> | ||||||
|         <groupId>org.springframework.boot</groupId> |         <groupId>org.springframework.boot</groupId> | ||||||
|         <artifactId>spring-boot-starter-parent</artifactId> |         <artifactId>spring-boot-starter-parent</artifactId> | ||||||
|         <version>1.2.4.RELEASE</version> |         <version>1.3.1.RELEASE</version> | ||||||
|     </parent> |     </parent> | ||||||
| 
 | 
 | ||||||
|     <dependencies> |     <dependencies> | ||||||
| @ -141,7 +141,6 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>junit</groupId> |             <groupId>junit</groupId> | ||||||
|             <artifactId>junit</artifactId> |             <artifactId>junit</artifactId> | ||||||
|             <version>${junit.version}</version> |  | ||||||
|             <scope>test</scope> |             <scope>test</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
| @ -199,7 +198,6 @@ | |||||||
|             <plugin> |             <plugin> | ||||||
|                 <groupId>org.apache.maven.plugins</groupId> |                 <groupId>org.apache.maven.plugins</groupId> | ||||||
|                 <artifactId>maven-compiler-plugin</artifactId> |                 <artifactId>maven-compiler-plugin</artifactId> | ||||||
|                 <version>${maven-compiler-plugin.version}</version> |  | ||||||
|                 <configuration> |                 <configuration> | ||||||
|                     <source>1.8</source> |                     <source>1.8</source> | ||||||
|                     <target>1.8</target> |                     <target>1.8</target> | ||||||
| @ -211,7 +209,6 @@ | |||||||
|             <plugin> |             <plugin> | ||||||
|                 <groupId>org.apache.maven.plugins</groupId> |                 <groupId>org.apache.maven.plugins</groupId> | ||||||
|                 <artifactId>maven-war-plugin</artifactId> |                 <artifactId>maven-war-plugin</artifactId> | ||||||
|                 <version>${maven-war-plugin.version}</version> |  | ||||||
|                 <configuration> |                 <configuration> | ||||||
|                     <failOnMissingWebXml>false</failOnMissingWebXml> |                     <failOnMissingWebXml>false</failOnMissingWebXml> | ||||||
|                 </configuration> |                 </configuration> | ||||||
| @ -220,7 +217,6 @@ | |||||||
|             <plugin> |             <plugin> | ||||||
|                 <groupId>org.apache.maven.plugins</groupId> |                 <groupId>org.apache.maven.plugins</groupId> | ||||||
|                 <artifactId>maven-surefire-plugin</artifactId> |                 <artifactId>maven-surefire-plugin</artifactId> | ||||||
|                 <version>${maven-surefire-plugin.version}</version> |  | ||||||
|                 <configuration> |                 <configuration> | ||||||
|                     <excludes> |                     <excludes> | ||||||
|                         <!-- <exclude>**/*ProductionTest.java</exclude> --> |                         <!-- <exclude>**/*ProductionTest.java</exclude> --> | ||||||
|  | |||||||
| @ -122,14 +122,14 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.servlet</groupId> |             <groupId>javax.servlet</groupId> | ||||||
|             <artifactId>javax.servlet-api</artifactId> |             <artifactId>javax.servlet-api</artifactId> | ||||||
|             <version>3.0.1</version> |             <version>${javax.servlet.version}</version> | ||||||
|             <scope>provided</scope> |             <scope>provided</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>javax.servlet</groupId> |             <groupId>javax.servlet</groupId> | ||||||
|             <artifactId>jstl</artifactId> |             <artifactId>jstl</artifactId> | ||||||
|             <version>1.2</version> |             <version>${jstl.version}</version> | ||||||
|             <scope>runtime</scope> |             <scope>runtime</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
| 
 | 
 | ||||||
| @ -294,6 +294,8 @@ | |||||||
| 
 | 
 | ||||||
|         <!-- various --> |         <!-- various --> | ||||||
|         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version> |         <hibernate-validator.version>5.2.2.Final</hibernate-validator.version> | ||||||
|  |         <javax.servlet.version>3.0.1</javax.servlet.version> | ||||||
|  |         <jstl.version>1.2</jstl.version> | ||||||
| 
 | 
 | ||||||
|         <!-- util --> |         <!-- util --> | ||||||
|         <guava.version>19.0</guava.version> |         <guava.version>19.0</guava.version> | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user