Index: extensions/maven2/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java
===================================================================
--- extensions/maven2/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java (revision 809)
+++ extensions/maven2/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java (working copy)
@@ -247,10 +247,10 @@
{
String id;
- + if (getContainerElement() == null)
{
- id = "jetty4xEmbedded";
+ id = "jetty5xEmbedded";
}
else
{
Index: extensions/maven2/pom.xml
===================================================================
--- extensions/maven2/pom.xml (revision 809)
+++ extensions/maven2/pom.xml (working copy)
@@ -30,7 +30,7 @@
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
- <version>4.2.20</version>
+ <version>5.1.10</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -48,16 +48,28 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>4.1.30</version>
+ <version>5.5.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>4.1.30</version>
+ <version>5.5.12</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.0.1</version>