From fed456039e17e66cd537856e4156bfcc07a1effd Mon Sep 17 00:00:00 2001
From: "mayhew64@gmail.com"
 <mayhew64@gmail.com@4033779f-a91e-0410-96ef-6bf7bf53c507>
Date: Fri, 20 Apr 2012 18:28:54 +0000
Subject: [PATCH] Update to tomcat 7

git-svn-id: http://webgoat.googlecode.com/svn/trunk/webgoat@442 4033779f-a91e-0410-96ef-6bf7bf53c507
---
 README.txt |  4 ++--
 pom.xml    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.txt b/README.txt
index 5a864f101..eb4ed01c4 100644
--- a/README.txt
+++ b/README.txt
@@ -89,7 +89,7 @@ Option 1: Run the project on Tomcat within Eclipse
 ---------------------------------------------------
 
 Install a local Tomcat server
-1. Download and unzip Apache Tomcat from http://tomcat.apache.org. Note that Tomcat 7.0 is currently not supported in WebGoat.
+1. Download and unzip Apache Tomcat from http://tomcat.apache.org. 
 2. Adapt the conf/tomcat-users.xml file of your Tomcat server:
 <?xml version="1.0" encoding="UTF-8"?>
     <tomcat-users>
@@ -102,7 +102,7 @@ Install a local Tomcat server
       <user password="tomcat" roles="tomcat" username="tomcat"/>
       <user password="guest" roles="webgoat_user" username="guest"/>
     </tomcat-users>
-3. Open Eclipse -> File -> New -> Other -> Server -> Apache
+3. Open Eclipse (WTP version) -> File -> New -> Other -> Server -> Apache
 4. Choose your Tomcat version
 -> Click next "browse" to your tomcat install.
 -> Make sure the "JRE" dropdown is pointing to your jdk. If it isn't listed, press
diff --git a/pom.xml b/pom.xml
index a2a4c54a5..e0be86f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 			<plugin>
         			<artifactId>maven-eclipse-plugin</artifactId>
         			<configuration>
-          				<wtpversion>1.5</wtpversion>
+          				<wtpversion>2.0</wtpversion>
         			</configuration>
       			</plugin>
 		</plugins>
@@ -114,7 +114,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.8</version>
+			<version>1.2.15</version>
 		</dependency>
 		<dependency>
 			<groupId>wsdl4j</groupId>
@@ -148,11 +148,11 @@
 			<version>2.3</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>tomcat</groupId>
-			<artifactId>catalina</artifactId>
-			<version>4.1.9</version>
-			<!--scope>provided</scope-->
+ 		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-catalina</artifactId>
+			<version>7.0.27</version>
+			<scope>provided</scope>
 		</dependency>
 
 	</dependencies>