updated to the latest version of Tiles

michaelisvy · Sep 11, 2012 · 7f048c3 · 7f048c3
1 parent fc58535
commit 7f048c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,8 +13,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
- 		<tiles.version>2.2.2</tiles.version>
+ 		<tiles.version>3.0.1</tiles.version>
  		<sl4j.version>1.7.0</sl4j.version>
+ 		<log4j.version>1.2.17</log4j.version>
  	</properties>
 
 	<build>
@@ -127,7 +128,7 @@
 	   <dependency>
 	      <groupId>log4j</groupId>
 	      <artifactId>log4j</artifactId>
-	      <version>1.2.14</version>
+	      <version>${log4j.version}</version>
 	      <scope>runtime</scope>
 	   </dependency>
 

diff --git a/src/main/webapp/WEB-INF/tags/layout.tag b/src/main/webapp/WEB-INF/tags/layout.tag
@@ -1,7 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ attribute name="title" required="true" rtexprvalue="true" %>
-
-
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -10,9 +8,7 @@
 		<link href="${styleUrl}/app.css" rel="stylesheet">
 	</head>
 <body>
-
 	<div class="container" style="padding-top: 50px;">
-
 		<jsp:include page="../menu.jsp"/>	
 			<jsp:doBody />
 		<jsp:include page="../footer.jsp"/>	

diff --git a/src/main/webapp/WEB-INF/view/jsp/menu.jsp b/src/main/webapp/WEB-INF/view/jsp/menu.jsp
@@ -1,9 +1,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
 <c:url value="/users/all/jsp-plain.htm" var="usersPlain" />
 <c:url value="/users/all/custom-tags.htm" var="usersCustomTags" />
 <c:url value="/images/springsource_banner_green.png" var="headerImage" />
-
 <div class="header well">
 	<img src="${headerImage}">
 	<div class="page-header">