upgrade jetty to 9.3.0.M0

jknack · jknack · commit b5c95a086fa3 · 2014-10-09T20:53:46.000-03:00
diff --git a/jooby-tests/src/test/java/jooby/AssetFeature.java b/jooby-tests/src/test/java/jooby/AssetFeature.java
@@ -15,7 +15,7 @@ public class AssetFeature extends ServerFeature {
   @Test
   public void jsAsset() throws Exception {
     HttpResponse response = Request.Get(uri("/assets/file.js").build()).execute().returnResponse();
-    assertEquals("application/javascript; charset=UTF-8", response.getFirstHeader("Content-Type")
+    assertEquals("application/javascript;charset=utf-8", response.getFirstHeader("Content-Type")
         .getValue());
     assertEquals(200, response.getStatusLine().getStatusCode());
     String lastModified = response.getFirstHeader("Last-Modified").getValue();
@@ -29,7 +29,7 @@ public void jsAsset() throws Exception {
   @Test
   public void cssAsset() throws Exception {
     HttpResponse response = Request.Get(uri("/assets/file.css").build()).execute().returnResponse();
-    assertEquals("text/css; charset=UTF-8", response.getFirstHeader("Content-Type")
+    assertEquals("text/css;charset=utf-8", response.getFirstHeader("Content-Type")
         .getValue());
     assertEquals(200, response.getStatusLine().getStatusCode());
     String lastModified = response.getFirstHeader("Last-Modified").getValue();
diff --git a/jooby-tests/src/test/java/jooby/ExceptionHandlingFeature.java b/jooby-tests/src/test/java/jooby/ExceptionHandlingFeature.java
@@ -48,7 +48,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)
   public void htmlError() throws Exception {
     assertHttp(Request.Get(uri("error").build()).addHeader("Accept", CHROME_ACCEPT))
         .status(Response.Status.SERVER_ERROR)
-        .type(MediaType.valueOf("text/html; charset=UTF-8"))
+        .type(MediaType.valueOf("text/html; charset=utf-8"))
         .done();
     ;
   }
@@ -57,7 +57,7 @@ public void htmlError() throws Exception {
   public void jsonError() throws Exception {
     assertHttp(Request.Get(uri("error").build()).addHeader("Accept", "application/json"))
         .status(Response.Status.SERVER_ERROR)
-        .type(MediaType.valueOf("application/json; charset=UTF-8"))
+        .type(MediaType.valueOf("application/json; charset=utf-8"))
         .done();
   }
 
diff --git a/pom.xml b/pom.xml
@@ -439,7 +439,7 @@
   <properties>
     <!-- Dependencies -->
     <jackson.version>2.4.0-rc3</jackson.version>
-    <jetty.version>9.2.0.RC0</jetty.version>
+    <jetty.version>9.3.0.M0</jetty.version>
     <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
     <slf4j-api.version>1.7.7</slf4j-api.version>
     <logback-classic.version>1.1.2</logback-classic.version>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)`
`48`	`48`	`public void htmlError() throws Exception {`
`49`	`49`	`assertHttp(Request.Get(uri("error").build()).addHeader("Accept", CHROME_ACCEPT))`
`50`	`50`	`.status(Response.Status.SERVER_ERROR)`
`51`		`- .type(MediaType.valueOf("text/html; charset=UTF-8"))`
	`51`	`+ .type(MediaType.valueOf("text/html; charset=utf-8"))`
`52`	`52`	`.done();`
`53`	`53`	`;`
`54`	`54`	`}`
`@@ -57,7 +57,7 @@ public void htmlError() throws Exception {`
`57`	`57`	`public void jsonError() throws Exception {`
`58`	`58`	`assertHttp(Request.Get(uri("error").build()).addHeader("Accept", "application/json"))`
`59`	`59`	`.status(Response.Status.SERVER_ERROR)`
`60`		`- .type(MediaType.valueOf("application/json; charset=UTF-8"))`
	`60`	`+ .type(MediaType.valueOf("application/json; charset=utf-8"))`
`61`	`61`	`.done();`
`62`	`62`	`}`
`63`	`63`