From 9cc9e0937e36110d47872b60cdeb624ad2d07294 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 30 Jan 2019 15:23:34 +0100
Subject: [PATCH] update jackson to version 2.9.8

---
 pom.xml                                                     | 2 +-
 .../sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cae4aa9bb6..a40f09c441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -829,7 +829,7 @@
     <resteasy.version>3.6.2.Final</resteasy.version>
     <jersey-client.version>1.19.4</jersey-client.version>
     <enunciate.version>2.11.1</enunciate.version>
-    <jackson.version>2.8.6</jackson.version>
+    <jackson.version>2.9.8</jackson.version>
     <guice.version>4.0</guice.version>
     <jaxb.version>2.3.0</jaxb.version>
 
diff --git a/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java b/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java
index 314dcdbeff..399f20cd3f 100644
--- a/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/net/ahc/DefaultAdvancedHttpResponseTest.java
@@ -41,6 +41,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.io.ByteSource;
 
+import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -134,7 +135,7 @@ public class DefaultAdvancedHttpResponseTest
                                       connection, 200, "OK");
     Multimap<String, String> headers = response.getHeaders();
 
-    assertThat(headers.get("Test"), contains("One", "Two"));
+    assertThat(headers.get("Test"), Matchers.contains("One", "Two"));
     assertTrue(headers.get("Test-2").isEmpty());
   }
 
@@ -142,8 +143,7 @@ public class DefaultAdvancedHttpResponseTest
 
   /** Field description */
   private final DefaultAdvancedHttpClient client =
-    new DefaultAdvancedHttpClient(new ScmConfiguration(),
-      new HashSet<ContentTransformer>(), new SSLContextProvider());
+    new DefaultAdvancedHttpClient(new ScmConfiguration(), new HashSet<>(), new SSLContextProvider());
 
   /** Field description */
   @Mock