Permalink
Browse files

Updated to new version of jetty and servlet 3.0.1 api

  • Loading branch information...
1 parent 7a57c70 commit 8a4861564563d83904cf020a2105e3535575a994 @aharin committed May 16, 2012
View
2 inproctester-htmlunit/pom.xml
@@ -23,7 +23,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
</dependency>
</dependencies>
View
8 inproctester-jersey-tests/pom.xml
@@ -14,20 +14,20 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
<dependency>
View
4 inproctester-jersey/pom.xml
@@ -16,13 +16,13 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
View
14 inproctester-jetty/pom.xml
@@ -23,7 +23,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>test-jetty-servlet</artifactId>
- <version>7.4.2.v20110526</version>
+ <version>8.1.3.v20120416</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
View
6 inproctester-jetty/src/main/java/com/thoughtworks/inproctester/jetty/HttpAppTester.java
@@ -25,8 +25,10 @@
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.webapp.WebAppContext;
+import javax.servlet.DispatcherType;
import javax.servlet.Filter;
import javax.servlet.Servlet;
+import java.util.EnumSet;
import java.util.EventListener;
import java.util.Map;
@@ -88,12 +90,12 @@ public void addServlet(Class<? extends Servlet> servletClass, String pathSpec) {
}
- public void addFilter(Class<? extends Filter> filterClass, String pathSpec, int dispatches, Map<String, String> initParameters) {
+ public void addFilter(Class<? extends Filter> filterClass, String pathSpec, EnumSet<DispatcherType> dispatches, Map<String, String> initParameters) {
FilterHolder servletHolder = context.addFilter(filterClass, pathSpec, dispatches);
servletHolder.setInitParameters(initParameters);
}
- public void addFilter(Class<? extends Filter> filterClass, String pathSpec, int dispatches) {
+ public void addFilter(Class<? extends Filter> filterClass, String pathSpec, EnumSet<DispatcherType> dispatches) {
context.addFilter(filterClass, pathSpec, dispatches);
}
View
8 inproctester-resteasy-tests/pom.xml
@@ -14,19 +14,19 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>2.2.2.GA</version>
+ <version>2.3.3.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
- <version>2.2.2.GA</version>
+ <version>2.3.3.Final</version>
</dependency>
<dependency>
View
2 inproctester-resteasy/pom.xml
@@ -16,7 +16,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>2.2.2.GA</version>
+ <version>2.3.3.Final</version>
</dependency>
View
3 ...esteasy/src/main/java/com/thoughtworks/inproctester/resteasy/InProcessClientExecutor.java
@@ -76,6 +76,9 @@ public void performReleaseConnection() {
return clientResponse;
}
+ public void close() throws Exception {
+ }
+
private InProcConnection routeToTesterApplication(URI requestUri) {
for (TesterRoute route : testerRoutes) {
if (route.matches(requestUri)) {
View
6 inproctester-tests/pom.xml
@@ -14,14 +14,14 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.18</version>
+ <version>2.3.19</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.inproctester</groupId>
View
2 inproctester-webdriver/pom.xml
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
- <version>2.0.0</version>
+ <version>2.21.0</version>
</dependency>
</dependencies>
<build>

0 comments on commit 8a48615

Please sign in to comment.