summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-01-23 16:53:47 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-01-24 12:42:37 +0100
commite8c1d18055235c312c13d6fd135c55b513990c8f (patch)
tree1c4da83c6bfbd660dea4e6dab54e24c30daa17f4
parent613a34bcdbcec0fce51866053ca7a7f18d12421b (diff)
Use Jetty 9.3.16
-rw-r--r--pom.xml2
-rw-r--r--vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 2f9f827fe1e..9b96e8bcf1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1068,7 +1068,7 @@
<curator.version>2.9.1</curator.version>
<jackson2.version>2.8.3</jackson2.version>
<jersey2.version>2.23.2</jersey2.version>
- <jetty.version>9.3.15.v20161220</jetty.version>
+ <jetty.version>9.3.16.v20170120</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.hide>true</test.hide>
<doclint>all</doclint>
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java
index 95a48ab41fe..f098e00ec6d 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/RestApiTest.java
@@ -286,7 +286,7 @@ public class RestApiTest {
private String doRest(HttpRequestBase request) throws IOException {
HttpClient client = HttpClientBuilder.create().build();
HttpResponse response = client.execute(request);
- assertThat(response.getEntity().getContentType().getValue().toString(), is("application/json; charset=UTF-8"));
+ assertThat(response.getEntity().getContentType().getValue().toString(), is("application/json;charset=utf-8"));
HttpEntity entity = response.getEntity();
return EntityUtils.toString(entity);
}