Merge branch 'jetty-9' into jetty-9-open-close

This commit is contained in:
Simone Bordet 2012-09-20 19:36:34 +02:00
commit a0de190367
2 changed files with 3 additions and 3 deletions

View File

@ -43,7 +43,7 @@ public class ResourceHandlerTest
private static ResourceHandler _resourceHandler;
@BeforeClass
public void setUp() throws Exception
public static void setUp() throws Exception
{
_server = new Server();
_connector = new ServerConnector(_server);
@ -58,7 +58,7 @@ public class ResourceHandlerTest
}
@AfterClass
public void tearDown() throws Exception
public static void tearDown() throws Exception
{
_server.stop();
}

View File

@ -509,7 +509,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<version>4.8.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>